* [U-Boot] [PATCH] davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board
@ 2011-11-19 10:45 Christian Riesch
2011-11-19 10:45 ` [U-Boot] [PATCH] davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board Christian Riesch
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Christian Riesch @ 2011-11-19 10:45 UTC (permalink / raw)
To: u-boot
This patch fixes the build breakage for the davinci_schmoogie board.
Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Sergey Kubushyn <ksi@koi8.net>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
---
board/davinci/schmoogie/schmoogie.c | 3 ---
include/configs/davinci_schmoogie.h | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/board/davinci/schmoogie/schmoogie.c b/board/davinci/schmoogie/schmoogie.c
index 8b615a9..52d00e4 100644
--- a/board/davinci/schmoogie/schmoogie.c
+++ b/board/davinci/schmoogie/schmoogie.c
@@ -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;
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 5eaa198..f4ddbea 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -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 */
/*===================*/
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH] davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board
2011-11-19 10:45 [U-Boot] [PATCH] davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board Christian Riesch
@ 2011-11-19 10:45 ` Christian Riesch
2011-11-24 21:32 ` Anatolij Gustschin
2011-11-19 10:45 ` [U-Boot] [PATCH] hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines Christian Riesch
2011-11-24 21:33 ` [U-Boot] [PATCH] davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board Anatolij Gustschin
2 siblings, 1 reply; 6+ messages in thread
From: Christian Riesch @ 2011-11-19 10:45 UTC (permalink / raw)
To: u-boot
This patch fixes the build breakage for the davinci_sonata board.
Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Sergey Kubushyn <ksi@koi8.net>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
---
board/davinci/sonata/sonata.c | 3 ---
include/configs/davinci_sonata.h | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/board/davinci/sonata/sonata.c b/board/davinci/sonata/sonata.c
index c194290..55110fb 100644
--- a/board/davinci/sonata/sonata.c
+++ b/board/davinci/sonata/sonata.c
@@ -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;
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index 74530e8..fc4d8ec 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -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 */
/*===================*/
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH] hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines
2011-11-19 10:45 [U-Boot] [PATCH] davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board Christian Riesch
2011-11-19 10:45 ` [U-Boot] [PATCH] davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board Christian Riesch
@ 2011-11-19 10:45 ` Christian Riesch
2011-11-24 21:51 ` Anatolij Gustschin
2011-11-24 21:33 ` [U-Boot] [PATCH] davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board Anatolij Gustschin
2 siblings, 1 reply; 6+ messages in thread
From: Christian Riesch @ 2011-11-19 10:45 UTC (permalink / raw)
To: u-boot
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.
Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Syed Mohammed Khasim <sm.khasim@gmail.com>
Cc: Sughosh Ganu <urwithsughosh@gmail.com>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
---
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(-)
diff --git a/arch/arm/include/asm/arch-davinci/davinci_misc.h b/arch/arm/include/asm/arch-davinci/davinci_misc.h
index 211b769..cbac803 100644
--- a/arch/arm/include/asm/arch-davinci/davinci_misc.h
+++ b/arch/arm/include/asm/arch-davinci/davinci_misc.h
@@ -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;
};
diff --git a/board/davinci/da8xxevm/hawkboard.c b/board/davinci/da8xxevm/hawkboard.c
index f34830e..9d4e238 100644
--- a/board/davinci/da8xxevm/hawkboard.c
+++ b/board/davinci/da8xxevm/hawkboard.c
@@ -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) &
diff --git a/board/davinci/da8xxevm/hawkboard_nand_spl.c b/board/davinci/da8xxevm/hawkboard_nand_spl.c
index e5e65e5..32b17ce 100644
--- a/board/davinci/da8xxevm/hawkboard_nand_spl.c
+++ b/board/davinci/da8xxevm/hawkboard_nand_spl.c
@@ -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) &
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH] hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines
2011-11-19 10:45 ` [U-Boot] [PATCH] hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines Christian Riesch
@ 2011-11-24 21:51 ` Anatolij Gustschin
0 siblings, 0 replies; 6+ messages in thread
From: Anatolij Gustschin @ 2011-11-24 21:51 UTC (permalink / raw)
To: u-boot
On Sat, 19 Nov 2011 11:45:44 +0100
Christian Riesch <christian.riesch@omicron.at> wrote:
> 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.
>
> Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
> Cc: Syed Mohammed Khasim <sm.khasim@gmail.com>
> Cc: Sughosh Ganu <urwithsughosh@gmail.com>
> Cc: Sandeep Paulraj <s-paulraj@ti.com>
> ---
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board
2011-11-19 10:45 [U-Boot] [PATCH] davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board Christian Riesch
2011-11-19 10:45 ` [U-Boot] [PATCH] davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board Christian Riesch
2011-11-19 10:45 ` [U-Boot] [PATCH] hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines Christian Riesch
@ 2011-11-24 21:33 ` Anatolij Gustschin
2 siblings, 0 replies; 6+ messages in thread
From: Anatolij Gustschin @ 2011-11-24 21:33 UTC (permalink / raw)
To: u-boot
On Sat, 19 Nov 2011 11:45:42 +0100
Christian Riesch <christian.riesch@omicron.at> wrote:
> This patch fixes the build breakage for the davinci_schmoogie board.
>
> Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
> Cc: Sergey Kubushyn <ksi@koi8.net>
> Cc: Sandeep Paulraj <s-paulraj@ti.com>
> ---
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-11-24 21:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-19 10:45 [U-Boot] [PATCH] davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board Christian Riesch
2011-11-19 10:45 ` [U-Boot] [PATCH] davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board Christian Riesch
2011-11-24 21:32 ` Anatolij Gustschin
2011-11-19 10:45 ` [U-Boot] [PATCH] hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines Christian Riesch
2011-11-24 21:51 ` Anatolij Gustschin
2011-11-24 21:33 ` [U-Boot] [PATCH] davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board Anatolij Gustschin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.