- Switch to using <configs/ti_armv7_omap.h> and family. This lets us drop lots of custom defines. - Ensure that our default environment uses DEFAULT_LINUX_BOOT_ENV so that Linux will boot correctly. - Enable CONFIG_DISTRO_DEFAULTS - Switch to using CONFIG_OF_CONTROL - Various other cleanups to match other SoCs in the family line.
Signed-off-by: Tom Rini trini@konsulko.com --- board/ti/ti816x/evm.c | 2 +- configs/ti816x_evm_defconfig | 19 +++++++++----- include/configs/ti816x_evm.h | 60 +++++++++++--------------------------------- 3 files changed, 28 insertions(+), 53 deletions(-)
diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c index 8f07e2c9aa00..577e60f875f4 100644 --- a/board/ti/ti816x/evm.c +++ b/board/ti/ti816x/evm.c @@ -24,7 +24,7 @@ DECLARE_GLOBAL_DATA_PTR;
int board_init(void) { - gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100; + gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; #if defined(CONFIG_NAND) gpmc_init(); #endif diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index 4f9019220b1b..729b709df900 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -8,25 +8,32 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL_FAT_SUPPORT=y +CONFIG_DEFAULT_DEVICE_TREE="dm8168-evm" +CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SPL=y +CONFIG_SPL_STACK_R=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 -CONFIG_SPL_YMODEM_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_SYS_PROMPT="u-boot/ti816x# " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y +CONFIG_CMD_I2C=y +# CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y +CONFIG_CMD_EXT4_WRITE=y +# CONFIG_ISO_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_DM_GPIO=y +CONFIG_DM_I2C=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y -CONFIG_OF_LIBFDT=y # CONFIG_USE_PRIVATE_LIBGCC is not set diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 35ee775adc42..27c6479ccc29 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -13,21 +13,16 @@ #define CONFIG_TI81XX #define CONFIG_TI816X
-#define CONFIG_ARCH_CPU_INIT - +#include <configs/ti_armv7_omap.h> #include <asm/arch/omap.h>
#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (32 * 1024)) -#define CONFIG_SYS_LONGHELP /* undef save memory */ #define CONFIG_MACH_TYPE MACH_TYPE_TI8168EVM
-#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG /* required for ramdisk support */ - #define CONFIG_EXTRA_ENV_SETTINGS \ - "loadaddr=0x81000000\0" \ + DEFAULT_LINUX_BOOT_ENV \ + "mtdids=" MTDIDS_DEFAULT "\0" \ + "mtdparts=" MTDPARTS_DEFAULT "\0" \
#define CONFIG_BOOTCOMMAND \ "mmc rescan;" \ @@ -40,28 +35,10 @@ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
-#define CONFIG_SYS_MAXARGS 32 -#define CONFIG_SYS_CBSIZE 512 /* console I/O buffer size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ - + sizeof(CONFIG_SYS_PROMPT) + 16) /* print buffer size */ -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* boot arg buffer size */ - -#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */ - #define CONFIG_CMD_ASKENV
-#define CONFIG_FS_FAT - -#define CONFIG_NR_DRAM_BANKS 2 /* we have 2 banks of DRAM */ -#define PHYS_DRAM_1 0x80000000 /* DRAM Bank #1 */ -#define PHYS_DRAM_1_SIZE 0x40000000 /* 1 GB */ -#define PHYS_DRAM_2 0xC0000000 /* DRAM Bank #2 */ -#define PHYS_DRAM_2_SIZE 0x40000000 /* 1 GB */ - #define CONFIG_MAX_RAM_BANK_SIZE (2048 << 20) /* 2048MB */ -#define CONFIG_SYS_SDRAM_BASE PHYS_DRAM_1 -#define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \ - GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_SDRAM_BASE 0x80000000
/** * Platform/Board specific defs @@ -94,11 +71,7 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1
/* NAND: SPL related configs */ -#define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_AM33XX_BCH -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
/* NAND: device related configs */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE @@ -109,7 +82,6 @@ #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_NAND_OMAP_GPMC_PREFETCH #define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS @@ -146,26 +118,13 @@ /* SPL */ /* Defines for SPL */ #define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x40400000 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE)
-#define CONFIG_SPL_BSS_START_ADDR 0x80000000 -#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */ - -#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" - -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds"
-#define CONFIG_SPL_BOARD_INIT - #define CONFIG_SYS_TEXT_BASE 0x80800000 -#define CONFIG_SYS_SPL_MALLOC_START 0x80208000 -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000
/* Since SPL did pll and ddr initialization for us, * we don't need to do it twice. @@ -174,4 +133,13 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #endif
+/* + * Disable MMC DM for SPL build and can be re-enabled after adding + * DM support in SPL + */ +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_DM_MMC +#undef CONFIG_TIMER +#undef CONFIG_DM_USB +#endif #endif