diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-04 18:12:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-04 18:12:57 -0400 |
| commit | 6bca655bcbc8e81a21ab27a0d1e9c711ab8e0e24 (patch) | |
| tree | 047f05ad2648c4b88ff5e02187e92a9e7835e8ae /board | |
| parent | 07d90d8bd451b9595fb0369c51f90ee2dccd5d9f (diff) | |
| parent | f3e2ebede3019740ee90471acc0a29a684b59221 (diff) | |
Merge branch '2020-06-04-misc-bugfixes'
- Resync checkpatch.pl (largely) with v5.7 and introduce U-Boot specific
checks in a localized area, so they aren't lost in the future.
- Complete / re-migrate some options from config headers to defconfigs
- Add dependencies to the various debug uart drivers
Diffstat (limited to 'board')
| -rw-r--r-- | board/phytec/pfla02/pfla02.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c index fed8f52e3e..0a961cc8a5 100644 --- a/board/phytec/pfla02/pfla02.c +++ b/board/phytec/pfla02/pfla02.c @@ -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)), }; -#ifdef CONFIG_CMD_NAND +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD) /* NAND */ static iomux_v3_cfg_t const nfc_pads[] = { 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); } -#ifdef CONFIG_CMD_NAND +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD) static void setup_gpmi_nand(void) { struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; @@ -361,7 +361,7 @@ int board_init(void) setup_gpios(); -#ifdef CONFIG_CMD_NAND +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD) setup_gpmi_nand(); #endif return 0; @@ -657,7 +657,7 @@ void board_init_f(ulong dummy) .refr = 7, /* 8 refresh commands per refresh cycle */ }; -#ifdef CONFIG_CMD_NAND +#if defined(CONFIG_CMD_NAND) && !defined(CONFIG_SPL_BUILD) /* Enable NAND */ setup_gpmi_nand(); #endif |