| Message ID | 20181122081933.11318-3-yegorslists@googlemail.com |
|---|---|
| State | Accepted |
| Commit | 1abff55a199b733c1addb8792db33ad5054bcd21 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,v2,1/4] arm: baltos: move the board to CONFIG_BLK | expand |
On Thu, 22 Nov 2018 at 01:19, <yegorslists@googlemail.com> wrote: > > From: Yegor Yefremov <yegorslists@googlemail.com> > > Also get rid of CONFIG_SYS_NAND_SPL_KERNEL_OFFS as SPL_OS_BOOT > feature won't be used. > > Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> > --- > configs/am335x_baltos_defconfig | 2 ++ > include/configs/baltos.h | 9 +-------- > 2 files changed, 3 insertions(+), 8 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
On Thu, Nov 22, 2018 at 09:19:32AM +0100, yegorslists@googlemail.com wrote: > From: Yegor Yefremov <yegorslists@googlemail.com> > > Also get rid of CONFIG_SYS_NAND_SPL_KERNEL_OFFS as SPL_OS_BOOT > feature won't be used. > > Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 4e68956b7c..74fd487097 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -47,6 +47,8 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MMC_OMAP_HS_ADMA=y CONFIG_NAND=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x00080000 CONFIG_PHY_ADDR_ENABLE=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 006b049d09..7b5f652f7e 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -34,15 +34,8 @@ /* FIT support */ #define CONFIG_SYS_BOOTM_LEN SZ_64M -/* UBI Support */ - -/* I2C configuration */ - #ifdef CONFIG_NAND -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000 -#ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ -#endif + #define NANDARGS \ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \