ARM: OMAP3: am3517_evm: Move header to ti_omap3_common.h
PATCH 1/2 ARM: OMAP3: am3517_evm: Move header to ti_omap3_common.h
Much of the AM3517 functions are copies of the standard definitions used in ti_omap3_common.h. Moving to include a common file reduces the amount of duplicative code and clutter. A few AM3517 specific functions (like EMIF4) are explictly defined and a few items are undefined or redefined, but overall the number of lines of code shink.
Signed-off-by Adam Ford <[email protected]>
--- include/configs/am3517_evm.h | 48 +++++--------------------------------------- 1 file changed, 5 insertions(+), 43 deletions(-)
include/configs/am3517_evm.h +5 -43
@@ -14,7 +14,6 @@#define __CONFIG_H#define CONFIG_NR_DRAM_BANKS 2/* CS1 may or may not be populated */ -#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ /*
@@ -27,39 +26,26 @@#define CONFIG_SYS_SPL_MALLOC_START 0x80208000#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap.h> +#include <configs/ti_omap3_common.h> +#undef CONFIG_SDRC/* Disable SDRC since we have EMIF4 */ #define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) - -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 << 20) -/* Hardware drivers */ /* NS16550 Configuration */ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK/* select serial console configuration */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_SERIAL3 3/* UART3 on AM3517 EVM */ +/* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}/* * USB configuration
@@ -104,16 +90,10 @@/* Board NAND Info. */ #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_NAND_OMAP_GPMC_PREFETCH #define CONFIG_BCH #define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ /* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access */ -/* nand@CS0 */ -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of */ -/* NAND devices */ #define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64
@@ -233,8 +213,6 @@/* We set the max number of command args high to avoid HUSH bugs. */ #define CONFIG_SYS_MAXARGS 64 -/* Console I/O Buffer Size */ -#define CONFIG_SYS_CBSIZE 512/* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ + sizeof(CONFIG_SYS_PROMPT) + 16)
@@ -246,27 +224,10 @@#define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + \ 0x01F00000)/* 31MB */ -#define CONFIG_SYS_LOAD_ADDR (OMAP34XX_SDRC_CS0)/* default load */ -/* address */ - -/* -* AM3517 has 12 GP timers, they can be driven by the system clock -* (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK). -* This rate is divided by a local divisor. -*/ -#define CONFIG_SYS_TIMERBASE OMAP34XX_GPT2 -#define CONFIG_SYS_PTV 2/* Divisor: 2^(PTV+1) => 8 */ -/* Physical Memory Map */ -#define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 -#define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1#define CONFIG_SYS_CS0_SIZE (256 * 1024 * 1024) -#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800#define CONFIG_SYS_INIT_RAM_SIZE 0x800 -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ - CONFIG_SYS_INIT_RAM_SIZE - \ - GENERATED_GBL_DATA_SIZE)/* FLASH and environment organization */
@@ -291,11 +252,12 @@/* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE +#undef CONFIG_SPL_TEXT_BASE#define CONFIG_SPL_TEXT_BASE 0x40200000#define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) +#undef CONFIG_SPL_BSS_START_ADDR#define CONFIG_SPL_BSS_START_ADDR 0x80000000#define CONFIG_SPL_BSS_MAX_SIZE 0x80000/* 512 KB */
Signature · 1 line
2.7.4
PATCH 2/2 omap3: am3517_evm: Enable TI_COMMON_CMD_OPTION
Enable TI_COMMON_CMD_OPTIONS and remove similar options from the defconfig. Updated with savedefconfig.
Signed-off-by Adam Ford <[email protected]>
--- board/logicpd/am3517evm/Kconfig | 2 ++ configs/am3517_evm_defconfig | 23 ++++++++--------------- 2 files changed, 10 insertions(+), 15 deletions(-)
board/logicpd/am3517evm/Kconfig +2 -0
@@ -9,4 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "am3517_evm" +source "board/ti/common/Kconfig" + endif
configs/am3517_evm_defconfig +8 -15
@@ -2,9 +2,9 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TI_COMMON_CMD_OPTIONS=y # CONFIG_SPL_GPIO_SUPPORT is not set CONFIG_TARGET_AM3517_EVM=y -CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=10 CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y
@@ -12,33 +12,26 @@ CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="AM3517_EVM # " -CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set -CONFIG_CMD_ASKENV=y +# CONFIG_CMD_EEPROM is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y +# CONFIG_CMD_GPT is not set CONFIG_CMD_NAND=y -CONFIG_CMD_PART=y -CONFIG_CMD_USB=y +# CONFIG_CMD_SPI is not set # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_PING=y +# CONFIG_CMD_MII is not set CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y +# CONFIG_CMD_TIME is not set CONFIG_CMD_UBI=y CONFIG_SPL_PARTITION_UUIDS=y +CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_STORAGE=y +# CONFIG_FAT_WRITE is not set CONFIG_OF_LIBFDT=y
Signature · 1 line
2.7.4
PATCH 2/2 omap3: am3517_evm: Enable TI_COMMON_CMD_OPTION
Quoted 4 lines · Adam Ford
Enable
TI_COMMON_CMD_OPTIONSand remove similar options from the defconfig. Updated with savedefconfig.Signed-off-by Adam Ford <[email protected]>
Tested-by Derald D. Woods <[email protected]>
Quoted 79 lines
--- board/logicpd/am3517evm/Kconfig | 2 ++ configs/am3517_evm_defconfig | 23 ++++++++--------------- 2 files changed, 10 insertions(+), 15 deletions(-)board/logicpd/am3517evm/Kconfig +2
-0@@ -9,4 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "am3517_evm" +source "board/ti/common/Kconfig" + endifconfigs/am3517_evm_defconfig +8
-15@@ -2,9 +2,9 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y CONFIG_SYS_TEXT_BASE=0x80100000 +CONFIG_TI_COMMON_CMD_OPTIONS=y # CONFIG_SPL_GPIO_SUPPORT is not set CONFIG_TARGET_AM3517_EVM=y -CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=10 CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y@@ -12,33 +12,26 @@ CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="AM3517_EVM # " -CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set -CONFIG_CMD_ASKENV=y +# CONFIG_CMD_EEPROM is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y +# CONFIG_CMD_GPT is not set CONFIG_CMD_NAND=y -CONFIG_CMD_PART=y -CONFIG_CMD_USB=y +# CONFIG_CMD_SPI is not set # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_PING=y +# CONFIG_CMD_MII is not set CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y +# CONFIG_CMD_TIME is not set CONFIG_CMD_UBI=y CONFIG_SPL_PARTITION_UUIDS=y +CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_STORAGE=y +# CONFIG_FAT_WRITE is not set CONFIG_OF_LIBFDT=ySignature · 6 lines
2.7.4 _______________________________________________ U-Boot mailing list U-Boot at lists.denx.de https://lists.denx.de/listinfo/u-boot
PATCH 2/2 omap3: am3517_evm: Enable TI_COMMON_CMD_OPTION
In reply to Adam FordQuoted 5 lines · Adam Ford
Enable
TI_COMMON_CMD_OPTIONSand remove similar options from the defconfig. Updated with savedefconfig.Signed-off-by Adam Ford <[email protected]>Tested-by Derald D. Woods <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170912/fbc4ddd1/attachment.sig>
PATCH 1/2 ARM: OMAP3: am3517_evm: Move header to ti_omap3_common.h
In reply to Adam FordQuoted 8 lines · Adam Ford
Much of the AM3517 functions are copies of the standard definitions used in
ti_omap3_common.h. Moving to include a common file reduces the amount of duplicative code and clutter. A few AM3517 specific functions (like EMIF4) are explictly defined and a few items are undefined or redefined, but overall the number of lines of code shink.Signed-off-by Adam Ford <[email protected]>
Tested-by Derald D. Woods <[email protected]>
Quoted 134 lines
--- include/configs/am3517_evm.h | 48 +++++--------------------------------------- 1 file changed, 5 insertions(+), 43 deletions(-)include/configs/am3517_evm.h +5
-43@@ -14,7 +14,6 @@#define __CONFIG_H#define CONFIG_NR_DRAM_BANKS 2/* CS1 may or may not be populated */ -#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ /* @@ -27,39 +26,26 @@#define CONFIG_SYS_SPL_MALLOC_START 0x80208000#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 -#include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap.h> +#include <configs/ti_omap3_common.h> +#undef CONFIG_SDRC/* Disable SDRC since we have EMIF4 */ #define CONFIG_MISC_INIT_R -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -/* Clock Defines */ -#define V_OSCK 26000000/* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) - -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (16 << 20) -/* Hardware drivers */ /* NS16550 Configuration */ -#define V_NS16550_CLK 48000000/* 48MHz (APLL96/2) */ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK/* select serial console configuration */ #define CONFIG_CONS_INDEX 3#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3#define CONFIG_SERIAL3 3/* UART3 on AM3517 EVM */ +/* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}/* * USB configuration @@ -104,16 +90,10 @@/* Board NAND Info. */ #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_NAND_OMAP_GPMC_PREFETCH #define CONFIG_BCH #define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */ /* to access nand */ -#define CONFIG_SYS_NAND_BASE NAND_BASE/* physical address */ -/* to access */ -/* nand at CS0 */ -#define CONFIG_SYS_MAX_NAND_DEVICE 1/* Max number of */ -/* NAND devices */ #define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64@@ -233,8 +213,6 @@/* We set the max number of command args high to avoid HUSH bugs. */ #define CONFIG_SYS_MAXARGS 64 -/* Console I/O Buffer Size */ -#define CONFIG_SYS_CBSIZE 512/* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ + sizeof(CONFIG_SYS_PROMPT) + 16)@@ -246,27 +224,10 @@#define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + \ 0x01F00000)/* 31MB */ -#define CONFIG_SYS_LOAD_ADDR (OMAP34XX_SDRC_CS0)/* default load */ -/* address */ - -/* -* AM3517 has 12 GP timers, they can be driven by the system clock -* (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK). -* This rate is divided by a local divisor. -*/ -#define CONFIG_SYS_TIMERBASE OMAP34XX_GPT2 -#define CONFIG_SYS_PTV 2/* Divisor: 2^(PTV+1) => 8 */ -/* Physical Memory Map */ -#define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 -#define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1#define CONFIG_SYS_CS0_SIZE (256 * 1024 * 1024) -#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800#define CONFIG_SYS_INIT_RAM_SIZE 0x800 -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ - CONFIG_SYS_INIT_RAM_SIZE - \ - GENERATED_GBL_DATA_SIZE)/* FLASH and environment organization */ @@ -291,11 +252,12 @@/* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE +#undef CONFIG_SPL_TEXT_BASE#define CONFIG_SPL_TEXT_BASE 0x40200000#define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) +#undef CONFIG_SPL_BSS_START_ADDR#define CONFIG_SPL_BSS_START_ADDR 0x80000000#define CONFIG_SPL_BSS_MAX_SIZE 0x80000/* 512 KB */ Signature · 6 lines
2.7.4 _______________________________________________ U-Boot mailing list U-Boot at lists.denx.de https://lists.denx.de/listinfo/u-boot
PATCH 1/2 ARM: OMAP3: am3517_evm: Move header to ti_omap3_common.h
In reply to Adam FordQuoted 9 lines · Adam Ford
Much of the AM3517 functions are copies of the standard definitions used in
ti_omap3_common.h. Moving to include a common file reduces the amount of duplicative code and clutter. A few AM3517 specific functions (like EMIF4) are explictly defined and a few items are undefined or redefined, but overall the number of lines of code shink.Signed-off-by Adam Ford <[email protected]>Tested-by Derald D. Woods <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170912/aa407e94/attachment.sig>