dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-25 04:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

pfla02: Rework excluding NAND from SPL

Browse Source 
Rather than only enable CONFIG_CMD_NAND for non-SPL builds, move the CMD
options to defconfig and rework the guards to not try and call the
function in SPL builds.

Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Tom Rini
2020-05-26 15:06:12 -04:00
parent 4cc24aeaf4
commit 049756c2fe
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
board/phytec/pfla02/pfla02.c
View File

@@ -117,7 +117,7 @@ static iomux_v3_cfg_t const gpios_pads[] = {
IOMUX_PADS(PAD_SD4_DAT3__GPIO2_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL)), IOMUX_PADS(PAD_SD4_DAT3__GPIO2_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL)),
}; };
#ifdef CONFIG_CMD_NAND #if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD)
/* NAND */ /* NAND */
static iomux_v3_cfg_t const nfc_pads[] = { static iomux_v3_cfg_t const nfc_pads[] = {
IOMUX_PADS(PAD_NANDF_CLE__NAND_CLE | MUX_PAD_CTRL(NAND_PAD_CTRL)), IOMUX_PADS(PAD_NANDF_CLE__NAND_CLE | MUX_PAD_CTRL(NAND_PAD_CTRL)),
@@ -274,7 +274,7 @@ static void setup_gpios(void)
SETUP_IOMUX_PADS(gpios_pads); SETUP_IOMUX_PADS(gpios_pads);
} }
#ifdef CONFIG_CMD_NAND #if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD)
static void setup_gpmi_nand(void) static void setup_gpmi_nand(void)
{ {
struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
@@ -361,7 +361,7 @@ int board_init(void)
setup_gpios(); setup_gpios();
#ifdef CONFIG_CMD_NAND #if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD)
setup_gpmi_nand(); setup_gpmi_nand();
#endif #endif
return 0; return 0;
@@ -657,7 +657,7 @@ void board_init_f(ulong dummy)
.refr = 7, /* 8 refresh commands per refresh cycle */ .refr = 7, /* 8 refresh commands per refresh cycle */
}; };
#ifdef CONFIG_CMD_NAND #if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD)
/* Enable NAND */ /* Enable NAND */
setup_gpmi_nand(); setup_gpmi_nand();
#endif #endif

2
configs/pfla02_defconfig
View File

@@ -37,7 +37,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
# CONFIG_CMD_NAND is not set CONFIG_CMD_NAND_TRIMFFS=y
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_EXT4_WRITE=y

4
include/configs/pfla02.h
View File

@@ -41,15 +41,11 @@
#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 0 */ #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 0 */
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#ifndef CONFIG_SPL_BUILD
#define CONFIG_CMD_NAND
/* Enable NAND support */ /* Enable NAND support */
#define CONFIG_CMD_NAND_TRIMFFS
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_BASE 0x40000000
#define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_5_ADDR_CYCLE
#define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_ONFI_DETECTION
#endif
/* DMA stuff, needed for GPMI/MXS NAND support */ /* DMA stuff, needed for GPMI/MXS NAND support */