Skip to contentSkip to conversation

davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board

PATCH New Christian Riesch 2 participants 6 messages Nov 19, 2011 – Nov 24, 2011 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board

This patch fixes the build breakage for the davinci_schmoogie board.

Cc Sergey Kubushyn <[email protected]>
Cc Sandeep Paulraj <[email protected]>
---
 board/davinci/schmoogie/schmoogie.c |    3 ---
 include/configs/davinci_schmoogie.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
board/davinci/schmoogie/schmoogie.c +0 -3
index 8b615a9..52d00e4 100644
@@ -33,9 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-	/* arch number of the board */
-	gd->bd->bi_arch_number = MACH_TYPE_SCHMOOGIE;
-
 	/* address of boot parameters */
 	gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR;
 
include/configs/davinci_schmoogie.h +3 -0
index 5eaa198..f4ddbea 100644
@@ -27,6 +27,9 @@
 #define CONFIG_SYS_NAND_LARGEPAGE
 #define CONFIG_SYS_USE_NAND
 #define CONFIG_DISPLAY_CPUINFO
+#define MACH_TYPE_SCHMOOGIE 1255
+#define CONFIG_MACH_TYPE MACH_TYPE_SCHMOOGIE
+
 /*===================*/
 /* SoC Configuration */
 /*===================*/
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board

This patch fixes the build breakage for the davinci_sonata board.

Cc Sergey Kubushyn <[email protected]>
Cc Sandeep Paulraj <[email protected]>
---
 board/davinci/sonata/sonata.c    |    3 ---
 include/configs/davinci_sonata.h |    2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)
board/davinci/sonata/sonata.c +0 -3
index c194290..55110fb 100644
@@ -34,9 +34,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-	/* arch number of the board */
-	gd->bd->bi_arch_number = MACH_TYPE_SONATA;
-
 	/* address of boot parameters */
 	gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR;
 
include/configs/davinci_sonata.h +2 -0
index 74530e8..fc4d8ec 100644
@@ -52,6 +52,8 @@
 #define CONFIG_SYS_NAND_SMALLPAGE
 #define CONFIG_SYS_USE_NOR
 #define CONFIG_DISPLAY_CPUINFO
+#define MACH_TYPE_SONATA 1254
+#define CONFIG_MACH_TYPE MACH_TYPE_SONATA
 /*===================*/
 /* SoC Configuration */
 /*===================*/
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 1/1 davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board

Quoted 9 lines · On Sat, 19 Nov 2011 11:45:43 +0100 Christian Riesch…

This patch fixes the build breakage for the davinci_sonata board.

Cc Sergey Kubushyn <[email protected]>
Cc Sandeep Paulraj <[email protected]>
---
 board/davinci/sonata/sonata.c    |    3 ---
 include/configs/davinci_sonata.h |    2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

Applied to u-boot-staging agust at denx.de. Thanks!

Anatolij

#3 lore raw

PATCH 1/1 hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines

In reply to Christian Riesch

This patch replaces the HAWKBOARD_KICK{0,1}_UNLOCK defines by DV_SYSCFG_KICK{0,1}_UNLOCK.

The kick register values are not hawkboard specific but may be used for all davinci boards. In commit f3c149d6c6e5ba8dd72baa86fe527837e4fb0e9a new defines for these values wer introduced.

Cc Syed Mohammed Khasim <[email protected]>
Cc Sughosh Ganu <[email protected]>
Cc Sandeep Paulraj <[email protected]>
---
 arch/arm/include/asm/arch-davinci/davinci_misc.h |    3 ---
 board/davinci/da8xxevm/hawkboard.c               |    4 ++--
 board/davinci/da8xxevm/hawkboard_nand_spl.c      |    4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)
arch/arm/include/asm/arch-davinci/davinci_misc.h +0 -3
index 211b769..cbac803 100644
@@ -45,9 +45,6 @@ struct pinmux_resource {
 				.n_pins = ARRAY_SIZE(item) \
 			  }
 
-#define HAWKBOARD_KICK0_UNLOCK          0x83e70b13
-#define HAWKBOARD_KICK1_UNLOCK          0x95a4f1e0
-
 struct lpsc_resource {
 	const int	lpsc_no;
 };
board/davinci/da8xxevm/hawkboard.c +2 -2
index f34830e..9d4e238 100644
@@ -47,8 +47,8 @@ int board_early_init_f(void)
 	/*
 	 * Kick Registers need to be set to allow access to Pin Mux registers
 	 */
-	writel(HAWKBOARD_KICK0_UNLOCK, &davinci_syscfg_regs->kick0);
-	writel(HAWKBOARD_KICK1_UNLOCK, &davinci_syscfg_regs->kick1);
+	writel(DV_SYSCFG_KICK0_UNLOCK, &davinci_syscfg_regs->kick0);
+	writel(DV_SYSCFG_KICK1_UNLOCK, &davinci_syscfg_regs->kick1);
 
 	/* set cfgchip3 to select mii */
 	writel(readl(&davinci_syscfg_regs->cfgchip3) &
board/davinci/da8xxevm/hawkboard_nand_spl.c +2 -2
index e5e65e5..32b17ce 100644
@@ -99,8 +99,8 @@ void board_init_f(ulong bootflag)
 	/*
 	 * Kick Registers need to be set to allow access to Pin Mux registers
 	 */
-	writel(HAWKBOARD_KICK0_UNLOCK, &davinci_syscfg_regs->kick0);
-	writel(HAWKBOARD_KICK1_UNLOCK, &davinci_syscfg_regs->kick1);
+	writel(DV_SYSCFG_KICK0_UNLOCK, &davinci_syscfg_regs->kick0);
+	writel(DV_SYSCFG_KICK1_UNLOCK, &davinci_syscfg_regs->kick1);
 
 	/* setup the SUSPSRC for ARM to control emulation suspend */
 	writel(readl(&davinci_syscfg_regs->suspsrc) &
Signature · 1 line
1.7.0.4
#4 lore raw

PATCH 1/1 hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines

Quoted 11 lines · On Sat, 19 Nov 2011 11:45:44 +0100 Christian Riesch…

This patch replaces the HAWKBOARD_KICK{0,1}_UNLOCK defines by DV_SYSCFG_KICK{0,1}_UNLOCK.

The kick register values are not hawkboard specific but may be used for all davinci boards. In commit f3c149d6c6e5ba8dd72baa86fe527837e4fb0e9a new defines for these values wer introduced.

Cc Syed Mohammed Khasim <[email protected]>
Cc Sughosh Ganu <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Quoted 5 lines
---
 arch/arm/include/asm/arch-davinci/davinci_misc.h |    3 ---
 board/davinci/da8xxevm/hawkboard.c               |    4 ++--
 board/davinci/da8xxevm/hawkboard_nand_spl.c      |    4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

Applied to u-boot-staging agust at denx.de. Thanks!

Anatolij

#5 lore raw

PATCH 1/1 davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board

In reply to Christian Riesch
Quoted 9 lines · On Sat, 19 Nov 2011 11:45:42 +0100 Christian Riesch…

This patch fixes the build breakage for the davinci_schmoogie board.

Cc Sergey Kubushyn <[email protected]>
Cc Sandeep Paulraj <[email protected]>
---
 board/davinci/schmoogie/schmoogie.c |    3 ---
 include/configs/davinci_schmoogie.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

Applied to u-boot-staging agust at denx.de. Thanks!

Anatolij