sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

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 <trini@ti.com>
Reviewed-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Tom Rini 2014-04-09 08:25:57 -04:00
parent 161d2d5ea8
commit d0e6d34d7c
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/cpu/armv7/am33xx/board.c
View File

@ -142,7 +142,7 @@ int arch_misc_init(void)
return 0; 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 * This function is the place to do per-board things such as ramp up the
* MPU clock frequency. * MPU clock frequency.
@ -200,9 +200,7 @@ static void watchdog_disable(void)
while (readl(&wdtimer->wdtwwps) != 0x0) while (readl(&wdtimer->wdtwwps) != 0x0)
; ;
} }
#endif
#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT)
void s_init(void) void s_init(void)
{ {
/* /*

2
arch/arm/cpu/armv7/am33xx/emif4.c
View File

@ -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 #ifdef CONFIG_TI81XX
static struct dmm_lisa_map_regs *hw_lisa_map_regs = static struct dmm_lisa_map_regs *hw_lisa_map_regs =
(struct dmm_lisa_map_regs *)DMM_BASE; (struct dmm_lisa_map_regs *)DMM_BASE;

2
board/silica/pengwyn/Makefile
View File

@ -6,7 +6,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_NOR_BOOT),y) ifeq ($(CONFIG_SKIP_LOWLEVEL_INIT),)
obj-y := mux.o obj-y := mux.o
endif endif

2
board/ti/am335x/Makefile
View File

@ -6,7 +6,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_NOR_BOOT),y) ifeq ($(CONFIG_SKIP_LOWLEVEL_INIT),)
obj-y := mux.o obj-y := mux.o
endif endif

2
board/ti/am335x/board.c
View File

@ -82,7 +82,7 @@ static int read_eeprom(struct am335x_baseboard_id *header)
return 0; return 0;
} }
#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT) #ifndef CONFIG_SKIP_LOWLEVEL_INIT
static const struct ddr_data ddr2_data = { static const struct ddr_data ddr2_data = {
.datardsratio0 = ((MT47H128M16RT25E_RD_DQS<<30) | .datardsratio0 = ((MT47H128M16RT25E_RD_DQS<<30) |
(MT47H128M16RT25E_RD_DQS<<20) | (MT47H128M16RT25E_RD_DQS<<20) |