Re: [U-Boot] [PATCH 2/2 V4] Changes to move hawkboard to the new spl infrastructure
Hi Sughosh, On Wed, Jan 11, 2012 at 6:03 PM, Sughosh Ganu urwithsugh...@gmail.com wrote: This patch moves hawkboard to the new spl infrastructure from the older nand_spl one. Removed the hawkboard_nand_config build option -- The spl code now gets compiled with hawkboard_config, after building the main u-boot image, using the CONFIG_SPL_TEXT_BASE. Modified the README.hawkboard to reflect the same. Signed-off-by: Sughosh Ganu urwithsugh...@gmail.com Signed-off-by: Heiko Schocher h...@denx.de Cc: Heiko Schocher h...@denx.de Cc: Christian Riesch christian.rie...@omicron.at Cc: Sudhakar Rajashekhara sudhakar@ti.com Cc: Tom Rini tr...@ti.com I have tested this with both the da850evm and the calimain board (see [1]), and the low level initialization still works :-) Therefore Acked-by: Christian Riesch christian.rie...@omicron.at Regards, Christian [1] http://patchwork.ozlabs.org/patch/135593/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2 V4] Changes to move hawkboard to the new spl infrastructure
hi Christian, On Thu Jan 12, 2012 at 10:02:47AM +0100, Christian Riesch wrote: Hi Sughosh, On Wed, Jan 11, 2012 at 6:03 PM, Sughosh Ganu urwithsugh...@gmail.com wrote: This patch moves hawkboard to the new spl infrastructure from the older nand_spl one. Removed the hawkboard_nand_config build option -- The spl code now gets compiled with hawkboard_config, after building the main u-boot image, using the CONFIG_SPL_TEXT_BASE. Modified the README.hawkboard to reflect the same. Signed-off-by: Sughosh Ganu urwithsugh...@gmail.com Signed-off-by: Heiko Schocher h...@denx.de Cc: Heiko Schocher h...@denx.de Cc: Christian Riesch christian.rie...@omicron.at Cc: Sudhakar Rajashekhara sudhakar@ti.com Cc: Tom Rini tr...@ti.com I have tested this with both the da850evm and the calimain board (see [1]), and the low level initialization still works :-) Therefore Acked-by: Christian Riesch christian.rie...@omicron.at Thanks for the review and ack :) Can you also please test out this patch. http://patchwork.ozlabs.org/patch/135275/ Just wanted to make sure it does not introduce any regressions. This is a generic arm926ejs fix, so you should be able to test this on any arm926ejs based board -sughosh ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2 V4] Changes to move hawkboard to the new spl infrastructure
On Thu, Jan 12, 2012 at 10:39 AM, Sughosh Ganu urwithsugh...@gmail.com wrote: hi Christian, On Thu Jan 12, 2012 at 10:02:47AM +0100, Christian Riesch wrote: Hi Sughosh, On Wed, Jan 11, 2012 at 6:03 PM, Sughosh Ganu urwithsugh...@gmail.com wrote: This patch moves hawkboard to the new spl infrastructure from the older nand_spl one. Removed the hawkboard_nand_config build option -- The spl code now gets compiled with hawkboard_config, after building the main u-boot image, using the CONFIG_SPL_TEXT_BASE. Modified the README.hawkboard to reflect the same. Signed-off-by: Sughosh Ganu urwithsugh...@gmail.com Signed-off-by: Heiko Schocher h...@denx.de Cc: Heiko Schocher h...@denx.de Cc: Christian Riesch christian.rie...@omicron.at Cc: Sudhakar Rajashekhara sudhakar@ti.com Cc: Tom Rini tr...@ti.com I have tested this with both the da850evm and the calimain board (see [1]), and the low level initialization still works :-) Therefore Acked-by: Christian Riesch christian.rie...@omicron.at Thanks for the review and ack :) Can you also please test out this patch. http://patchwork.ozlabs.org/patch/135275/ Just wanted to make sure it does not introduce any regressions. This is a generic arm926ejs fix, so you should be able to test this on any arm926ejs based board Ok, I'll do a few tests and reply in the other thread. Christian ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2 V4] Changes to move hawkboard to the new spl infrastructure
This patch moves hawkboard to the new spl infrastructure from the
older nand_spl one.
Removed the hawkboard_nand_config build option -- The spl code now
gets compiled with hawkboard_config, after building the main u-boot
image, using the CONFIG_SPL_TEXT_BASE. Modified the README.hawkboard
to reflect the same.
Signed-off-by: Sughosh Ganu urwithsugh...@gmail.com
Signed-off-by: Heiko Schocher h...@denx.de
Cc: Heiko Schocher h...@denx.de
Cc: Christian Riesch christian.rie...@omicron.at
Cc: Sudhakar Rajashekhara sudhakar@ti.com
Cc: Tom Rini tr...@ti.com
---
Changes since V3
* Removed CONFIG_SYS_DA850_LPSC_UART from enbw_cmc board.
* Restored the point at which da850_ddr_setup is called in
arch_cpu_init
* Put the pll based functions under CONFIG_SYS_DA850_PLL_INIT
Changes since V2
* Made changes to fix build break on enbw_cmc board.
* Replaced defines used for conditionally compiling code in
da850_lowlevel.c to the ones suggested by Heiko.
* Removed unwanted defines from the config files which were added in
V1.
Changes since V1
* Use a common file instead of board specific files for spl,
based on review comments from Christian and Heiko.
arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c| 24 ++-
arch/arm/cpu/arm926ejs/davinci/spl.c |4 +-
arch/arm/include/asm/arch-davinci/da850_lowlevel.h |9 +
board/davinci/da8xxevm/da850evm.c |4 +-
board/davinci/da8xxevm/hawkboard.c | 23 +++
board/davinci/da8xxevm/hawkboard_nand_spl.c| 115 ---
.../{u-boot-spl.lds = u-boot-spl-da850evm.lds}|0
.../davinci/da8xxevm/u-boot-spl-hawk.lds | 22 ++-
board/enbw/enbw_cmc/enbw_cmc.c | 13 +--
boards.cfg |1 -
doc/README.hawkboard | 43 +++---
include/configs/da850evm.h |5 +-
include/configs/enbw_cmc.h |4 +-
include/configs/hawkboard.h| 23 +++-
nand_spl/board/davinci/da8xxevm/Makefile | 155
15 files changed, 114 insertions(+), 331 deletions(-)
delete mode 100644 board/davinci/da8xxevm/hawkboard_nand_spl.c
rename board/davinci/da8xxevm/{u-boot-spl.lds = u-boot-spl-da850evm.lds}
(100%)
rename nand_spl/board/davinci/da8xxevm/u-boot.lds =
board/davinci/da8xxevm/u-boot-spl-hawk.lds (86%)
delete mode 100644 nand_spl/board/davinci/da8xxevm/Makefile
diff --git a/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c
b/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c
index a532f8a..01bbc4e 100644
--- a/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c
+++ b/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c
@@ -32,6 +32,7 @@
#include asm/arch/emif_defs.h
#include asm/arch/pll_defs.h
+#if defined(CONFIG_SYS_DA850_PLL_INIT)
void da850_waitloop(unsigned long loopcnt)
{
unsigned long i;
@@ -156,7 +157,9 @@ int da850_pll_init(struct davinci_pllc_regs *reg, unsigned
long pllmult)
return 0;
}
+#endif /* CONFIG_SYS_DA850_PLL_INIT */
+#if defined(CONFIG_SYS_DA850_DDR_INIT)
int da850_ddr_setup(void)
{
unsigned long tmp;
@@ -235,6 +238,7 @@ int da850_ddr_setup(void)
return 0;
}
+#endif /* CONFIG_SYS_DA850_DDR_INIT */
__attribute__((weak))
void board_gpio_init(void)
@@ -242,10 +246,6 @@ void board_gpio_init(void)
return;
}
-/* pinmux_resource[] vector is defined in the board specific file */
-extern const struct pinmux_resource pinmuxes[];
-extern const int pinmuxes_size;
-
int arch_cpu_init(void)
{
/* Unlock kick registers */
@@ -259,13 +259,11 @@ int arch_cpu_init(void)
if (davinci_configure_pin_mux_items(pinmuxes, pinmuxes_size))
return 1;
+#if defined(CONFIG_SYS_DA850_PLL_INIT)
/* PLL setup */
da850_pll_init(davinci_pllc0_regs, CONFIG_SYS_DA850_PLL0_PLLM);
da850_pll_init(davinci_pllc1_regs, CONFIG_SYS_DA850_PLL1_PLLM);
-
- /* GPIO setup */
- board_gpio_init();
-
+#endif
/* setup CSn config */
#if defined(CONFIG_SYS_DA850_CS2CFG)
writel(CONFIG_SYS_DA850_CS2CFG, davinci_emif_regs-ab1cr);
@@ -274,7 +272,12 @@ int arch_cpu_init(void)
writel(CONFIG_SYS_DA850_CS3CFG, davinci_emif_regs-ab2cr);
#endif
- lpsc_on(CONFIG_SYS_DA850_LPSC_UART);
+ da8xx_configure_lpsc_items(lpsc, lpsc_size);
+
+ /* GPIO setup */
+ board_gpio_init();
+
+
NS16550_init((NS16550_t)(CONFIG_SYS_NS16550_COM1),
CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE);
@@ -286,6 +289,9 @@ int arch_cpu_init(void)
DAVINCI_UART_PWREMU_MGMT_UTRST),
davinci_uart2_ctrl_regs-pwremu_mgmt);
+#if defined(CONFIG_SYS_DA850_DDR_INIT)
da850_ddr_setup();
+#endif
+
return 0;
}
diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c
b/arch/arm/cpu/arm926ejs/davinci/spl.c
index f475f9b..74632e5 100644
---
Re: [U-Boot] [PATCH 2/2 V4] Changes to move hawkboard to the new spl infrastructure
Hello Sughosh, Sughosh Ganu wrote: This patch moves hawkboard to the new spl infrastructure from the older nand_spl one. Removed the hawkboard_nand_config build option -- The spl code now gets compiled with hawkboard_config, after building the main u-boot image, using the CONFIG_SPL_TEXT_BASE. Modified the README.hawkboard to reflect the same. Signed-off-by: Sughosh Ganu urwithsugh...@gmail.com Signed-off-by: Heiko Schocher h...@denx.de Cc: Heiko Schocher h...@denx.de Cc: Christian Riesch christian.rie...@omicron.at Cc: Sudhakar Rajashekhara sudhakar@ti.com Cc: Tom Rini tr...@ti.com --- Patch looks good to me, but it doesn't aplly to current TOT [hs@pollux u-boot]$ git am index.html Applying: Changes to move hawkboard to the new spl infrastructure error: patch failed: include/configs/da850evm.h:44 error: include/configs/da850evm.h: patch does not apply Patch failed at 0001 Changes to move hawkboard to the new spl infrastructure When you have resolved this problem run git am --resolved. If you would prefer to skip this patch, instead run git am --skip. To restore the original branch and stop patching run git am --abort. [hs@pollux u-boot]$ My tree is commit 9a4209869bd2c37affd931d627b3c3e72952 Author: Rob Herring rob.herr...@calxeda.com Date: Thu Dec 15 11:15:50 2011 + ARM: highbank: enable networking and pxe Do I missing something here? (If I remember right, I had no such issue with your v1 patch ...) bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2 V4] Changes to move hawkboard to the new spl infrastructure
hi Heiko, On Thu Jan 12, 2012 at 08:24:03AM +0100, Heiko Schocher wrote: Hello Sughosh, Sughosh Ganu wrote: This patch moves hawkboard to the new spl infrastructure from the older nand_spl one. Removed the hawkboard_nand_config build option -- The spl code now gets compiled with hawkboard_config, after building the main u-boot image, using the CONFIG_SPL_TEXT_BASE. Modified the README.hawkboard to reflect the same. Signed-off-by: Sughosh Ganu urwithsugh...@gmail.com Signed-off-by: Heiko Schocher h...@denx.de Cc: Heiko Schocher h...@denx.de Cc: Christian Riesch christian.rie...@omicron.at Cc: Sudhakar Rajashekhara sudhakar@ti.com Cc: Tom Rini tr...@ti.com --- Patch looks good to me, but it doesn't aplly to current TOT [hs@pollux u-boot]$ git am index.html Applying: Changes to move hawkboard to the new spl infrastructure error: patch failed: include/configs/da850evm.h:44 error: include/configs/da850evm.h: patch does not apply Patch failed at 0001 Changes to move hawkboard to the new spl infrastructure When you have resolved this problem run git am --resolved. If you would prefer to skip this patch, instead run git am --skip. To restore the original branch and stop patching run git am --abort. [hs@pollux u-boot]$ I have based this on u-boot-ti, as this would be applied to the ti tree. -sughosh ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
