aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYegor Yefremov <yegorslists@googlemail.com>2018-11-22 09:19:32 +0100
committerTom Rini <trini@konsulko.com>2018-12-03 10:44:10 -0500
commit1abff55a199b733c1addb8792db33ad5054bcd21 (patch)
tree4bd353e1e1404aeace3d5a64e99ddaedce93e561
parent43c2c6c364ef4f682eaa62e294bad42bcb0382c1 (diff)
downloadu-boot-1abff55a199b733c1addb8792db33ad5054bcd21.zip
u-boot-1abff55a199b733c1addb8792db33ad5054bcd21.tar.gz
u-boot-1abff55a199b733c1addb8792db33ad5054bcd21.tar.bz2
arm: baltos: move CONFIG_SYS_NAND_U_BOOT_OFFS to defconfig
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>
-rw-r--r--configs/am335x_baltos_defconfig2
-rw-r--r--include/configs/baltos.h9
2 files changed, 3 insertions, 8 deletions
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
index 4e68956..74fd487 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 006b049..7b5f652 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" \