Skip to contentSkip to conversation

am335x: Switch to CONFIG_SKIP_LOWLEVEL_INIT from guarding SPL or NOR_BOOT

PATCH In review Tom Rini 2 participants 3 messages Apr 9, 2014 – Apr 18, 2014 Arm (32-bit)

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 am335x: Switch to CONFIG_SKIP_LOWLEVEL_INIT from guarding SPL or NOR_BOOT

In the case of SPL or NOR_BOOT (no SPL involved) we need to include certain code in the build. Use !CONFIG_SKIP_LOWLEVEL_INIT rather than CONFIG_SPL_BUILD || CONFIG_NOR_BOOT to make the code clearer, and to make supporting XIP QSPI boot clearer in the code.

Signed-off-by Tom Rini <[email protected]>
---
 arch/arm/cpu/armv7/am33xx/board.c |    4 +---
 arch/arm/cpu/armv7/am33xx/emif4.c |    2 +-
 board/silica/pengwyn/Makefile     |    2 +-
 board/ti/am335x/Makefile          |    2 +-
 board/ti/am335x/board.c           |    2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)
arch/arm/cpu/armv7/am33xx/board.c +1 -3
index fb44cc8..28c16f8 100644
@@ -142,7 +142,7 @@ int arch_misc_init(void)
 	return 0;
 }
 
-#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT)
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
 /*
  * This function is the place to do per-board things such as ramp up the
  * MPU clock frequency.

@@ -200,9 +200,7 @@ static void watchdog_disable(void)
 	while (readl(&wdtimer->wdtwwps) != 0x0)
 		;
 }
-#endif
 
-#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT)
 void s_init(void)
 {
 	/*
arch/arm/cpu/armv7/am33xx/emif4.c +1 -1
index 3e39752..2c67c32 100644
@@ -35,7 +35,7 @@ void dram_init_banksize(void)
 }
 
 
-#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT)
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
 #ifdef CONFIG_TI81XX
 static struct dmm_lisa_map_regs *hw_lisa_map_regs =
 				(struct dmm_lisa_map_regs *)DMM_BASE;
board/silica/pengwyn/Makefile +1 -1
index c8b4f9a..804ac37 100644
@@ -6,7 +6,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_NOR_BOOT),y)
+ifeq ($(CONFIG_SKIP_LOWLEVEL_INIT),)
 obj-y	:= mux.o
 endif
board/ti/am335x/Makefile +1 -1
index c8b4f9a..804ac37 100644
@@ -6,7 +6,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_NOR_BOOT),y)
+ifeq ($(CONFIG_SKIP_LOWLEVEL_INIT),)
 obj-y	:= mux.o
 endif
board/ti/am335x/board.c +1 -1
index 554398f..fe1d000 100644
@@ -81,7 +81,7 @@ static int read_eeprom(struct am335x_baseboard_id *header)
 	return 0;
 }
 
-#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT)
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
 static const struct ddr_data ddr2_data = {
 	.datardsratio0 = ((MT47H128M16RT25E_RD_DQS<<30) |
 			  (MT47H128M16RT25E_RD_DQS<<20) |
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 am335x: Switch to CONFIG_SKIP_LOWLEVEL_INIT from guarding SPL or NOR_BOOT

Dear Tom Rini,

Quoted 5 lines · In message <[email protected]> you wrote:

In the case of SPL or NOR_BOOT (no SPL involved) we need to include certain code in the build. Use !CONFIG_SKIP_LOWLEVEL_INIT rather than CONFIG_SPL_BUILD || CONFIG_NOR_BOOT to make the code clearer, and to make supporting XIP QSPI boot clearer in the code.

Quoted 8 lines
Signed-off-by Tom Rini <[email protected]>
---
 arch/arm/cpu/armv7/am33xx/board.c |    4 +---
 arch/arm/cpu/armv7/am33xx/emif4.c |    2 +-
 board/silica/pengwyn/Makefile     |    2 +-
 board/ti/am335x/Makefile          |    2 +-
 board/ti/am335x/board.c           |    2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)
Reviewed-by Wolfgang Denk <[email protected]>

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Wenn Du ein' weise Antwort verlangst, Mu?t Du vern?nftig fragen.
                                                -- Goethe, Invektiven
author
#2 lore raw
In reply to Tom Rini
Quoted 7 lines · Tom Rini

In the case of SPL or NOR_BOOT (no SPL involved) we need to include certain code in the build. Use !CONFIG_SKIP_LOWLEVEL_INIT rather than CONFIG_SPL_BUILD || CONFIG_NOR_BOOT to make the code clearer, and to make supporting XIP QSPI boot clearer in the code.

Signed-off-by Tom Rini <[email protected]>
Reviewed-by Wolfgang Denk <[email protected]>

Applied to u-boot-ti/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140418/c7701e90/attachment.pgp>