diff options
| author | Tom Rini <trini@ti.com> | 2014-04-09 08:25:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-04-17 17:24:40 -0400 |
| commit | d0e6d34d7cca00cb61707826b52837cc7c43da46 (patch) | |
| tree | d6f7a6ad65a87cc03820ca580bbfdbdbc78f7f9c /board | |
| parent | 161d2d5ea8262e97cac77eec3ed7d32069cb7444 (diff) | |
| download | u-boot-imx-d0e6d34d7cca00cb61707826b52837cc7c43da46.zip u-boot-imx-d0e6d34d7cca00cb61707826b52837cc7c43da46.tar.gz u-boot-imx-d0e6d34d7cca00cb61707826b52837cc7c43da46.tar.bz2 | |
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>
Diffstat (limited to 'board')
| -rw-r--r-- | board/silica/pengwyn/Makefile | 2 | ||||
| -rw-r--r-- | board/ti/am335x/Makefile | 2 | ||||
| -rw-r--r-- | board/ti/am335x/board.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/board/silica/pengwyn/Makefile b/board/silica/pengwyn/Makefile index c8b4f9a..804ac37 100644 --- a/board/silica/pengwyn/Makefile +++ b/board/silica/pengwyn/Makefile @@ -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 diff --git a/board/ti/am335x/Makefile b/board/ti/am335x/Makefile index c8b4f9a..804ac37 100644 --- a/board/ti/am335x/Makefile +++ b/board/ti/am335x/Makefile @@ -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 diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index ce7a8b0..da780ed 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -82,7 +82,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) | |