| Message ID | 1375475175-5073-9-git-send-email-trini@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
On 08/02/2013 03:26 PM, Tom Rini wrote: > Update omap5_common.h to use ti_armv7_common.h, and in turn update > dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are The commit headline does not indicate anything about dra7xx. So dra7xx dev's might over look this change. > that IP blocks which exist on the platform, and had clocks enabled, > now have the drivers being built as well. > > Signed-off-by: Tom Rini <trini@ti.com> > --- > include/configs/dra7xx_evm.h | 11 +-- > include/configs/omap5_common.h | 188 +++++----------------------------------- > include/configs/omap5_uevm.h | 8 +- > 3 files changed, 31 insertions(+), 176 deletions(-) > > diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h > index 51be73d..58786ff 100644 > --- a/include/configs/dra7xx_evm.h > +++ b/include/configs/dra7xx_evm.h > @@ -12,21 +12,18 @@ > #ifndef __CONFIG_DRA7XX_EVM_H > #define __CONFIG_DRA7XX_EVM_H > > -/* High Level Configuration Options */ > -#define CONFIG_DRA7XX /* in a TI DRA7XX core */ > -#define CONFIG_ENV_IS_NOWHERE /* For now. */ > - > -#include <configs/omap5_common.h> > +#define CONFIG_DRA7XX > > -#define CONFIG_SYS_PROMPT "DRA752 EVM # " > +#define CONFIG_ENV_IS_NOWHERE /* For now. */ > > +#define CONSOLEDEV "ttyO0" > #define CONFIG_CONS_INDEX 1 > #define CONFIG_SYS_NS16550_COM1 UART1_BASE > #define CONFIG_BAUDRATE 115200 > > #define CONFIG_SYS_OMAP_ABE_SYSCK > > -#define CONSOLEDEV "ttyO0" > +#include <configs/omap5_common.h> > > /* CPSW Ethernet */ > #define CONFIG_CMD_NET > diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h > index 7dd56cf..469a081 100644 > --- a/include/configs/omap5_common.h > +++ b/include/configs/omap5_common.h > @@ -14,106 +14,51 @@ > #ifndef __CONFIG_OMAP5_COMMON_H > #define __CONFIG_OMAP5_COMMON_H > > -/* > - * High Level Configuration Options > - */ > -#define CONFIG_OMAP /* in a TI OMAP core */ > -#define CONFIG_OMAP54XX /* which is a 54XX */ > -#define CONFIG_OMAP_GPIO > - > -/* Get CPU defs */ > -#include <asm/arch/cpu.h> > -#include <asm/arch/omap.h> > - > -/* Display CPU and Board Info */ > +#define CONFIG_OMAP54XX > #define CONFIG_DISPLAY_CPUINFO > #define CONFIG_DISPLAY_BOARDINFO > - > #define CONFIG_MISC_INIT_R > +#define CONFIG_ARCH_CPU_INIT > > -#define CONFIG_OF_LIBFDT > -#define CONFIG_CMD_BOOTZ > +#define CONFIG_SYS_CACHELINE_SIZE 64 > > -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ > -#define CONFIG_SETUP_MEMORY_TAGS > -#define CONFIG_INITRD_TAG > +/* Use General purpose timer 1 */ > +#define CONFIG_SYS_TIMERBASE GPT2_BASE > + > +#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS > + > +/* Defines for SDRAM init */ > +#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS > +#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION > +#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS > +#endif > + > +#ifndef CONFIG_SPL_BUILD > +#define CONFIG_PALMAS_POWER > +#endif > + > +#include <asm/arch/cpu.h> > +#include <asm/arch/omap.h> > > -/* > - * Size of malloc() pool > - * Total Size Environment - 128k > - * Malloc - add 256k > - */ > #define CONFIG_ENV_SIZE (128 << 10) > -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (256 << 10)) > -/* Vector Base */ > -#define CONFIG_SYS_CA9_VECTOR_BASE SRAM_ROM_VECT_BASE > > -/* > - * Hardware drivers > - */ > +#include <configs/ti_armv7_common.h> > > /* > - * serial port - NS16550 compatible > + * Hardware drivers > */ > -#define V_NS16550_CLK 48000000 > - > #define CONFIG_SYS_NS16550 > #define CONFIG_SYS_NS16550_SERIAL > #define CONFIG_SYS_NS16550_REG_SIZE (-4) > -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK > - > -/* CPU */ > -#define CONFIG_ARCH_CPU_INIT > - > -/* I2C */ > -#define CONFIG_HARD_I2C > -#define CONFIG_SYS_I2C_SPEED 100000 > -#define CONFIG_SYS_I2C_SLAVE 1 > -#define CONFIG_DRIVER_OMAP34XX_I2C > -#define CONFIG_I2C_MULTI_BUS > - > -/* MMC */ > -#define CONFIG_GENERIC_MMC > -#define CONFIG_MMC > -#define CONFIG_OMAP_HSMMC > -#define CONFIG_DOS_PARTITION > - > -#define CONFIG_SYS_CONSOLE_IS_IN_ENV > - > -/* Flash */ > -#define CONFIG_SYS_NO_FLASH > - > -/* Cache */ > -#define CONFIG_SYS_CACHELINE_SIZE 64 > -#define CONFIG_SYS_CACHELINE_SHIFT 6 > +#define CONFIG_SYS_NS16550_CLK 48000000 > > -/* commands to include */ > -#include <config_cmd_default.h> > - > -/* Enabled commands */ > -#define CONFIG_CMD_EXT2 /* EXT2 Support */ > -#define CONFIG_CMD_FAT /* FAT support */ > -#define CONFIG_CMD_I2C /* I2C serial bus support */ > -#define CONFIG_CMD_MMC /* MMC support */ > - > -/* Disabled commands */ > +/* Per-SoC commands */ > #undef CONFIG_CMD_NET > #undef CONFIG_CMD_NFS > -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ > -#undef CONFIG_CMD_IMLS /* List all found images */ > > /* > * Environment setup > */ > - > -#define CONFIG_BOOTDELAY 3 > -#define CONFIG_ENV_VARS_UBOOT_CONFIG > -#define CONFIG_CMD_FS_GENERIC > -#define CONFIG_CMD_EXT2 > -#define CONFIG_CMD_EXT4 > - > -#define CONFIG_ENV_OVERWRITE > - > #ifndef PARTS_DEFAULT > #define PARTS_DEFAULT > #endif > @@ -178,96 +123,11 @@ > "fi; " \ > "fi" > > -#define CONFIG_AUTO_COMPLETE 1 > - > -/* > - * Miscellaneous configurable options > - */ > - > -#define CONFIG_SYS_LONGHELP /* undef to save memory */ > -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ > -#define CONFIG_SYS_CBSIZE 256 > -/* Print Buffer Size */ > -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ > - sizeof(CONFIG_SYS_PROMPT) + 16) > -#define CONFIG_SYS_MAXARGS 16 > -/* Boot Argument Buffer Size */ > -#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) > - > -/* > - * memtest setup > - */ > -#define CONFIG_SYS_MEMTEST_START 0x80000000 > -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (32 << 20)) > - > -/* Default load address */ > -#define CONFIG_SYS_LOAD_ADDR 0x80000000 > - > -/* Use General purpose timer 1 */ > -#define CONFIG_SYS_TIMERBASE GPT2_BASE > -#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ > -#define CONFIG_SYS_HZ 1000 > - > -/* > - * SDRAM Memory Map > - * Even though we use two CS all the memory > - * is mapped to one contiguous block > - */ > -#define CONFIG_NR_DRAM_BANKS 1 > - > -#define CONFIG_SYS_SDRAM_BASE 0x80000000 > -#define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \ > - GENERATED_GBL_DATA_SIZE) > - > -#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS > - > -/* Defines for SDRAM init */ > -#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS > -#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION > -#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS > -#endif > - > -#ifndef CONFIG_SPL_BUILD > -#define CONFIG_PALMAS_POWER > -#endif > > /* Defines for SPL */ > -#define CONFIG_SPL > -#define CONFIG_SPL_FRAMEWORK > #define CONFIG_SPL_TEXT_BASE 0x40300350 > #define CONFIG_SPL_MAX_SIZE 0x19000 /* 100K */ > -#define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR > #define CONFIG_SPL_DISPLAY_PRINT > - > -#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */ > -#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ > -#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1 > -#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img" > - > -#define CONFIG_SPL_LIBCOMMON_SUPPORT > -#define CONFIG_SPL_LIBDISK_SUPPORT > -#define CONFIG_SPL_I2C_SUPPORT > -#define CONFIG_SPL_MMC_SUPPORT > -#define CONFIG_SPL_FAT_SUPPORT > -#define CONFIG_SPL_LIBGENERIC_SUPPORT > -#define CONFIG_SPL_SERIAL_SUPPORT > #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" > > -/* > - * 64 bytes before this address should be set aside for u-boot.img's > - * header. That is 80E7FFC0--0x80E80000 should not be used for any > - * other needs. > - */ > -#define CONFIG_SYS_TEXT_BASE 0x80E80000 > - > -/* > - * BSS and malloc area 64MB into memory to allow enough > - * space for the kernel at the beginning of memory > - */ > -#define CONFIG_SPL_BSS_START_ADDR 0x84000000 > -#define CONFIG_SPL_BSS_MAX_SIZE 0x100000 /* 1 MB */ > -#define CONFIG_SYS_SPL_MALLOC_START 0x84100000 > -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 /* 1 MB */ > -#define CONFIG_SPL_GPIO_SUPPORT > - > #endif /* __CONFIG_OMAP5_COMMON_H */ > diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h > index 47568e9..d10c2b5 100644 > --- a/include/configs/omap5_uevm.h > +++ b/include/configs/omap5_uevm.h > @@ -17,8 +17,6 @@ > "uuid_disk=${uuid_gpt_disk};" \ > "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}" > > -#include <configs/omap5_common.h> > - > #define CONFIG_CONS_INDEX 3 > #define CONFIG_SYS_NS16550_COM3 UART3_BASE > #define CONFIG_BAUDRATE 115200 > @@ -42,9 +40,9 @@ > #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4 > #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22 > > -#define CONFIG_SYS_PROMPT "OMAP5432 uEVM # " > - > #define CONSOLEDEV "ttyO2" > - > #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC 16296 > + > +#include <configs/omap5_common.h> > + > #endif /* __CONFIG_OMAP5_EVM_H */ Would it be better to split this into two patches? one for OMAP5 and one for dra7xx? Dan
On 08/02/2013 03:26 PM, Tom Rini wrote: > Update omap5_common.h to use ti_armv7_common.h, and in turn update > dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are The commit headline does not indicate anything about dra7xx. So dra7xx dev's might over look this change. > that IP blocks which exist on the platform, and had clocks enabled, > now have the drivers being built as well. > > Signed-off-by: Tom Rini <trini@ti.com> > --- > include/configs/dra7xx_evm.h | 11 +-- > include/configs/omap5_common.h | 188 +++++----------------------------------- > include/configs/omap5_uevm.h | 8 +- > 3 files changed, 31 insertions(+), 176 deletions(-) > > diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h > index 51be73d..58786ff 100644 > --- a/include/configs/dra7xx_evm.h > +++ b/include/configs/dra7xx_evm.h > @@ -12,21 +12,18 @@ > #ifndef __CONFIG_DRA7XX_EVM_H > #define __CONFIG_DRA7XX_EVM_H > > -/* High Level Configuration Options */ > -#define CONFIG_DRA7XX /* in a TI DRA7XX core */ > -#define CONFIG_ENV_IS_NOWHERE /* For now. */ > - > -#include <configs/omap5_common.h> > +#define CONFIG_DRA7XX > > -#define CONFIG_SYS_PROMPT "DRA752 EVM # " > +#define CONFIG_ENV_IS_NOWHERE /* For now. */ > > +#define CONSOLEDEV "ttyO0" > #define CONFIG_CONS_INDEX 1 > #define CONFIG_SYS_NS16550_COM1 UART1_BASE > #define CONFIG_BAUDRATE 115200 > > #define CONFIG_SYS_OMAP_ABE_SYSCK > > -#define CONSOLEDEV "ttyO0" > +#include <configs/omap5_common.h> > > /* CPSW Ethernet */ > #define CONFIG_CMD_NET > diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h > index 7dd56cf..469a081 100644 > --- a/include/configs/omap5_common.h > +++ b/include/configs/omap5_common.h > @@ -14,106 +14,51 @@ > #ifndef __CONFIG_OMAP5_COMMON_H > #define __CONFIG_OMAP5_COMMON_H > > -/* > - * High Level Configuration Options > - */ > -#define CONFIG_OMAP /* in a TI OMAP core */ > -#define CONFIG_OMAP54XX /* which is a 54XX */ > -#define CONFIG_OMAP_GPIO > - > -/* Get CPU defs */ > -#include <asm/arch/cpu.h> > -#include <asm/arch/omap.h> > - > -/* Display CPU and Board Info */ > +#define CONFIG_OMAP54XX > #define CONFIG_DISPLAY_CPUINFO > #define CONFIG_DISPLAY_BOARDINFO > - > #define CONFIG_MISC_INIT_R > +#define CONFIG_ARCH_CPU_INIT > > -#define CONFIG_OF_LIBFDT > -#define CONFIG_CMD_BOOTZ > +#define CONFIG_SYS_CACHELINE_SIZE 64 > > -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ > -#define CONFIG_SETUP_MEMORY_TAGS > -#define CONFIG_INITRD_TAG > +/* Use General purpose timer 1 */ > +#define CONFIG_SYS_TIMERBASE GPT2_BASE > + > +#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS > + > +/* Defines for SDRAM init */ > +#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS > +#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION > +#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS > +#endif > + > +#ifndef CONFIG_SPL_BUILD > +#define CONFIG_PALMAS_POWER > +#endif > + > +#include <asm/arch/cpu.h> > +#include <asm/arch/omap.h> > > -/* > - * Size of malloc() pool > - * Total Size Environment - 128k > - * Malloc - add 256k > - */ > #define CONFIG_ENV_SIZE (128 << 10) > -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (256 << 10)) > -/* Vector Base */ > -#define CONFIG_SYS_CA9_VECTOR_BASE SRAM_ROM_VECT_BASE > > -/* > - * Hardware drivers > - */ > +#include <configs/ti_armv7_common.h> > > /* > - * serial port - NS16550 compatible > + * Hardware drivers > */ > -#define V_NS16550_CLK 48000000 > - > #define CONFIG_SYS_NS16550 > #define CONFIG_SYS_NS16550_SERIAL > #define CONFIG_SYS_NS16550_REG_SIZE (-4) > -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK > - > -/* CPU */ > -#define CONFIG_ARCH_CPU_INIT > - > -/* I2C */ > -#define CONFIG_HARD_I2C > -#define CONFIG_SYS_I2C_SPEED 100000 > -#define CONFIG_SYS_I2C_SLAVE 1 > -#define CONFIG_DRIVER_OMAP34XX_I2C > -#define CONFIG_I2C_MULTI_BUS > - > -/* MMC */ > -#define CONFIG_GENERIC_MMC > -#define CONFIG_MMC > -#define CONFIG_OMAP_HSMMC > -#define CONFIG_DOS_PARTITION > - > -#define CONFIG_SYS_CONSOLE_IS_IN_ENV > - > -/* Flash */ > -#define CONFIG_SYS_NO_FLASH > - > -/* Cache */ > -#define CONFIG_SYS_CACHELINE_SIZE 64 > -#define CONFIG_SYS_CACHELINE_SHIFT 6 > +#define CONFIG_SYS_NS16550_CLK 48000000 > > -/* commands to include */ > -#include <config_cmd_default.h> > - > -/* Enabled commands */ > -#define CONFIG_CMD_EXT2 /* EXT2 Support */ > -#define CONFIG_CMD_FAT /* FAT support */ > -#define CONFIG_CMD_I2C /* I2C serial bus support */ > -#define CONFIG_CMD_MMC /* MMC support */ > - > -/* Disabled commands */ > +/* Per-SoC commands */ > #undef CONFIG_CMD_NET > #undef CONFIG_CMD_NFS > -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ > -#undef CONFIG_CMD_IMLS /* List all found images */ > > /* > * Environment setup > */ > - > -#define CONFIG_BOOTDELAY 3 > -#define CONFIG_ENV_VARS_UBOOT_CONFIG > -#define CONFIG_CMD_FS_GENERIC > -#define CONFIG_CMD_EXT2 > -#define CONFIG_CMD_EXT4 > - > -#define CONFIG_ENV_OVERWRITE > - > #ifndef PARTS_DEFAULT > #define PARTS_DEFAULT > #endif > @@ -178,96 +123,11 @@ > "fi; " \ > "fi" > > -#define CONFIG_AUTO_COMPLETE 1 > - > -/* > - * Miscellaneous configurable options > - */ > - > -#define CONFIG_SYS_LONGHELP /* undef to save memory */ > -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ > -#define CONFIG_SYS_CBSIZE 256 > -/* Print Buffer Size */ > -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ > - sizeof(CONFIG_SYS_PROMPT) + 16) > -#define CONFIG_SYS_MAXARGS 16 > -/* Boot Argument Buffer Size */ > -#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) > - > -/* > - * memtest setup > - */ > -#define CONFIG_SYS_MEMTEST_START 0x80000000 > -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (32 << 20)) > - > -/* Default load address */ > -#define CONFIG_SYS_LOAD_ADDR 0x80000000 > - > -/* Use General purpose timer 1 */ > -#define CONFIG_SYS_TIMERBASE GPT2_BASE > -#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ > -#define CONFIG_SYS_HZ 1000 > - > -/* > - * SDRAM Memory Map > - * Even though we use two CS all the memory > - * is mapped to one contiguous block > - */ > -#define CONFIG_NR_DRAM_BANKS 1 > - > -#define CONFIG_SYS_SDRAM_BASE 0x80000000 > -#define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \ > - GENERATED_GBL_DATA_SIZE) > - > -#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS > - > -/* Defines for SDRAM init */ > -#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS > -#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION > -#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS > -#endif > - > -#ifndef CONFIG_SPL_BUILD > -#define CONFIG_PALMAS_POWER > -#endif > > /* Defines for SPL */ > -#define CONFIG_SPL > -#define CONFIG_SPL_FRAMEWORK > #define CONFIG_SPL_TEXT_BASE 0x40300350 > #define CONFIG_SPL_MAX_SIZE 0x19000 /* 100K */ > -#define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR > #define CONFIG_SPL_DISPLAY_PRINT > - > -#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */ > -#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ > -#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1 > -#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img" > - > -#define CONFIG_SPL_LIBCOMMON_SUPPORT > -#define CONFIG_SPL_LIBDISK_SUPPORT > -#define CONFIG_SPL_I2C_SUPPORT > -#define CONFIG_SPL_MMC_SUPPORT > -#define CONFIG_SPL_FAT_SUPPORT > -#define CONFIG_SPL_LIBGENERIC_SUPPORT > -#define CONFIG_SPL_SERIAL_SUPPORT > #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" > > -/* > - * 64 bytes before this address should be set aside for u-boot.img's > - * header. That is 80E7FFC0--0x80E80000 should not be used for any > - * other needs. > - */ > -#define CONFIG_SYS_TEXT_BASE 0x80E80000 > - > -/* > - * BSS and malloc area 64MB into memory to allow enough > - * space for the kernel at the beginning of memory > - */ > -#define CONFIG_SPL_BSS_START_ADDR 0x84000000 > -#define CONFIG_SPL_BSS_MAX_SIZE 0x100000 /* 1 MB */ > -#define CONFIG_SYS_SPL_MALLOC_START 0x84100000 > -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 /* 1 MB */ > -#define CONFIG_SPL_GPIO_SUPPORT > - > #endif /* __CONFIG_OMAP5_COMMON_H */ > diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h > index 47568e9..d10c2b5 100644 > --- a/include/configs/omap5_uevm.h > +++ b/include/configs/omap5_uevm.h > @@ -17,8 +17,6 @@ > "uuid_disk=${uuid_gpt_disk};" \ > "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}" > > -#include <configs/omap5_common.h> > - > #define CONFIG_CONS_INDEX 3 > #define CONFIG_SYS_NS16550_COM3 UART3_BASE > #define CONFIG_BAUDRATE 115200 > @@ -42,9 +40,9 @@ > #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4 > #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22 > > -#define CONFIG_SYS_PROMPT "OMAP5432 uEVM # " > - > #define CONSOLEDEV "ttyO2" > - > #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC 16296 > + > +#include <configs/omap5_common.h> > + > #endif /* __CONFIG_OMAP5_EVM_H */ Would it be better to split this into two patches? one for OMAP5 and one for dra7xx? Dan
On Tue, Aug 06, 2013 at 01:37:34PM -0500, Dan Murphy wrote: > On 08/02/2013 03:26 PM, Tom Rini wrote: > > Update omap5_common.h to use ti_armv7_common.h, and in turn update > > dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are > > The commit headline does not indicate anything about dra7xx. So > dra7xx dev's might over look this change. Re-worded. [snip] > Would it be better to split this into two patches? one for OMAP5 and > one for dra7xx? Can't, would break bisectability (both use omap5_common.h and that's where the changes really are, the board changes are largely consistency with am335x_evm.h ordering).
Tom On 08/06/2013 02:13 PM, Tom Rini wrote: > On Tue, Aug 06, 2013 at 01:37:34PM -0500, Dan Murphy wrote: >> On 08/02/2013 03:26 PM, Tom Rini wrote: >>> Update omap5_common.h to use ti_armv7_common.h, and in turn update >>> dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are >> The commit headline does not indicate anything about dra7xx. So >> dra7xx dev's might over look this change. > Re-worded. > > [snip] >> Would it be better to split this into two patches? one for OMAP5 and >> one for dra7xx? > Can't, would break bisectability (both use omap5_common.h and that's > where the changes really are, the board changes are largely consistency > with am335x_evm.h ordering). > I am good with the re-word then. Reviewed-by: Dan Murphy <dmurphy@ti.com>
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 51be73d..58786ff 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -12,21 +12,18 @@ #ifndef __CONFIG_DRA7XX_EVM_H #define __CONFIG_DRA7XX_EVM_H -/* High Level Configuration Options */ -#define CONFIG_DRA7XX /* in a TI DRA7XX core */ -#define CONFIG_ENV_IS_NOWHERE /* For now. */ - -#include <configs/omap5_common.h> +#define CONFIG_DRA7XX -#define CONFIG_SYS_PROMPT "DRA752 EVM # " +#define CONFIG_ENV_IS_NOWHERE /* For now. */ +#define CONSOLEDEV "ttyO0" #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 UART1_BASE #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_OMAP_ABE_SYSCK -#define CONSOLEDEV "ttyO0" +#include <configs/omap5_common.h> /* CPSW Ethernet */ #define CONFIG_CMD_NET diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h index 7dd56cf..469a081 100644 --- a/include/configs/omap5_common.h +++ b/include/configs/omap5_common.h @@ -14,106 +14,51 @@ #ifndef __CONFIG_OMAP5_COMMON_H #define __CONFIG_OMAP5_COMMON_H -/* - * High Level Configuration Options - */ -#define CONFIG_OMAP /* in a TI OMAP core */ -#define CONFIG_OMAP54XX /* which is a 54XX */ -#define CONFIG_OMAP_GPIO - -/* Get CPU defs */ -#include <asm/arch/cpu.h> -#include <asm/arch/omap.h> - -/* Display CPU and Board Info */ +#define CONFIG_OMAP54XX #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO - #define CONFIG_MISC_INIT_R +#define CONFIG_ARCH_CPU_INIT -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ +#define CONFIG_SYS_CACHELINE_SIZE 64 -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG +/* Use General purpose timer 1 */ +#define CONFIG_SYS_TIMERBASE GPT2_BASE + +#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS + +/* Defines for SDRAM init */ +#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS +#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION +#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS +#endif + +#ifndef CONFIG_SPL_BUILD +#define CONFIG_PALMAS_POWER +#endif + +#include <asm/arch/cpu.h> +#include <asm/arch/omap.h> -/* - * Size of malloc() pool - * Total Size Environment - 128k - * Malloc - add 256k - */ #define CONFIG_ENV_SIZE (128 << 10) -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (256 << 10)) -/* Vector Base */ -#define CONFIG_SYS_CA9_VECTOR_BASE SRAM_ROM_VECT_BASE -/* - * Hardware drivers - */ +#include <configs/ti_armv7_common.h> /* - * serial port - NS16550 compatible + * Hardware drivers */ -#define V_NS16550_CLK 48000000 - #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* CPU */ -#define CONFIG_ARCH_CPU_INIT - -/* I2C */ -#define CONFIG_HARD_I2C -#define CONFIG_SYS_I2C_SPEED 100000 -#define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_DRIVER_OMAP34XX_I2C -#define CONFIG_I2C_MULTI_BUS - -/* MMC */ -#define CONFIG_GENERIC_MMC -#define CONFIG_MMC -#define CONFIG_OMAP_HSMMC -#define CONFIG_DOS_PARTITION - -#define CONFIG_SYS_CONSOLE_IS_IN_ENV - -/* Flash */ -#define CONFIG_SYS_NO_FLASH - -/* Cache */ -#define CONFIG_SYS_CACHELINE_SIZE 64 -#define CONFIG_SYS_CACHELINE_SHIFT 6 +#define CONFIG_SYS_NS16550_CLK 48000000 -/* commands to include */ -#include <config_cmd_default.h> - -/* Enabled commands */ -#define CONFIG_CMD_EXT2 /* EXT2 Support */ -#define CONFIG_CMD_FAT /* FAT support */ -#define CONFIG_CMD_I2C /* I2C serial bus support */ -#define CONFIG_CMD_MMC /* MMC support */ - -/* Disabled commands */ +/* Per-SoC commands */ #undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS -#undef CONFIG_CMD_FPGA /* FPGA configuration Support */ -#undef CONFIG_CMD_IMLS /* List all found images */ /* * Environment setup */ - -#define CONFIG_BOOTDELAY 3 -#define CONFIG_ENV_VARS_UBOOT_CONFIG -#define CONFIG_CMD_FS_GENERIC -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 - -#define CONFIG_ENV_OVERWRITE - #ifndef PARTS_DEFAULT #define PARTS_DEFAULT #endif @@ -178,96 +123,11 @@ "fi; " \ "fi" -#define CONFIG_AUTO_COMPLETE 1 - -/* - * Miscellaneous configurable options - */ - -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ -#define CONFIG_SYS_CBSIZE 256 -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ - sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_MAXARGS 16 -/* Boot Argument Buffer Size */ -#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) - -/* - * memtest setup - */ -#define CONFIG_SYS_MEMTEST_START 0x80000000 -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (32 << 20)) - -/* Default load address */ -#define CONFIG_SYS_LOAD_ADDR 0x80000000 - -/* Use General purpose timer 1 */ -#define CONFIG_SYS_TIMERBASE GPT2_BASE -#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ -#define CONFIG_SYS_HZ 1000 - -/* - * SDRAM Memory Map - * Even though we use two CS all the memory - * is mapped to one contiguous block - */ -#define CONFIG_NR_DRAM_BANKS 1 - -#define CONFIG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \ - GENERATED_GBL_DATA_SIZE) - -#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS - -/* Defines for SDRAM init */ -#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS -#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION -#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS -#endif - -#ifndef CONFIG_SPL_BUILD -#define CONFIG_PALMAS_POWER -#endif /* Defines for SPL */ -#define CONFIG_SPL -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x40300350 #define CONFIG_SPL_MAX_SIZE 0x19000 /* 100K */ -#define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR #define CONFIG_SPL_DISPLAY_PRINT - -#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */ -#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ -#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1 -#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img" - -#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_SPL_MMC_SUPPORT -#define CONFIG_SPL_FAT_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" -/* - * 64 bytes before this address should be set aside for u-boot.img's - * header. That is 80E7FFC0--0x80E80000 should not be used for any - * other needs. - */ -#define CONFIG_SYS_TEXT_BASE 0x80E80000 - -/* - * BSS and malloc area 64MB into memory to allow enough - * space for the kernel at the beginning of memory - */ -#define CONFIG_SPL_BSS_START_ADDR 0x84000000 -#define CONFIG_SPL_BSS_MAX_SIZE 0x100000 /* 1 MB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x84100000 -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 /* 1 MB */ -#define CONFIG_SPL_GPIO_SUPPORT - #endif /* __CONFIG_OMAP5_COMMON_H */ diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 47568e9..d10c2b5 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -17,8 +17,6 @@ "uuid_disk=${uuid_gpt_disk};" \ "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}" -#include <configs/omap5_common.h> - #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 UART3_BASE #define CONFIG_BAUDRATE 115200 @@ -42,9 +40,9 @@ #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4 #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22 -#define CONFIG_SYS_PROMPT "OMAP5432 uEVM # " - #define CONSOLEDEV "ttyO2" - #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC 16296 + +#include <configs/omap5_common.h> + #endif /* __CONFIG_OMAP5_EVM_H */
Update omap5_common.h to use ti_armv7_common.h, and in turn update dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are that IP blocks which exist on the platform, and had clocks enabled, now have the drivers being built as well. Signed-off-by: Tom Rini <trini@ti.com> --- include/configs/dra7xx_evm.h | 11 +-- include/configs/omap5_common.h | 188 +++++----------------------------------- include/configs/omap5_uevm.h | 8 +- 3 files changed, 31 insertions(+), 176 deletions(-)