Prepare for TI816X : reuse existing code from TI814X
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v5 1/3 Prepare for TI816X : reuse existing code from TI814X
Rename some CONFIG_TI814X to a more generic CONFIG_81XX
--- Makefile | 2 +- arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/omap-common/Makefile | 2 +- arch/arm/include/asm/arch-am33xx/cpu.h | 2 +- arch/arm/include/asm/arch-am33xx/omap.h | 2 +- drivers/serial/ns16550.c | 4 ++-- spl/Makefile | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-)
Makefile +1 -1
@@ -337,7 +337,7 @@ LIBS-y += api/libapi.o LIBS-y += post/libpost.o LIBS-y += test/libtest.o -ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI814X),) +ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI81XX),) LIBS-y += $(CPUDIR)/omap-common/libomap-common.o endif
arch/arm/cpu/armv7/Makefile +1 -1
@@ -32,7 +32,7 @@ COBJS += cache_v7.o COBJS += cpu.o COBJS += syslib.o -ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI814X),) +ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI81XX),) SOBJS += lowlevel_init.o endif
arch/arm/cpu/armv7/omap-common/Makefile +1 -1
@@ -37,7 +37,7 @@ COBJS += vc.o COBJS += abb.o endif -ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI814X),) +ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI81XX),) COBJS += boot-common.o SOBJS += lowlevel_init.o endif
arch/arm/include/asm/arch-am33xx/cpu.h +1 -1
@@ -54,7 +54,7 @@/* Reset control */ #ifdef CONFIG_AM33XX #define PRM_RSTCTRL (PRCM_BASE + 0x0F00) -#elif defined(CONFIG_TI814X ) +#elif defined(CONFIG_TI81XX )#define PRM_RSTCTRL (PRCM_BASE + 0x00A0)#endif #define PRM_RSTST (PRM_RSTCTRL + 8)
arch/arm/include/asm/arch-am33xx/omap.h +1 -1
@@ -32,7 +32,7 @@#define NON_SECURE_SRAM_START 0x402F0400#define NON_SECURE_SRAM_END 0x40310000#define SRAM_SCRATCH_SPACE_ADDR 0x4030C000 -#elif defined(CONFIG_TI814X ) +#elif defined(CONFIG_TI81XX )#define NON_SECURE_SRAM_START 0x40300000#define NON_SECURE_SRAM_END 0x40320000#define SRAM_SCRATCH_SPACE_ADDR 0x4031B800
drivers/serial/ns16550.c +2 -2
@@ -57,7 +57,7 @@ void NS16550_init(NS16550_t com_port, int baud_divisor)serial_out (CONFIG_SYS_NS16550_IER , &com_port->ier);#if (defined(CONFIG_OMAP ) && !defined(CONFIG_OMAP3_ZOOM2 )) || \ - defined(CONFIG_AM33XX ) || defined(CONFIG_TI814X ) + defined(CONFIG_AM33XX ) || defined(CONFIG_TI81XX )serial_out (0x7 , &com_port->mdr1);/* mode select reset TL16C750*/ #endif serial_out (UART_LCR_BKSE |UART_LCRVAL , &com_port->lcr);
@@ -72,7 +72,7 @@ void NS16550_init(NS16550_t com_port, int baud_divisor)serial_out (UART_LCRVAL , &com_port->lcr);#if (defined(CONFIG_OMAP ) && !defined(CONFIG_OMAP3_ZOOM2 )) || \ defined(CONFIG_AM33XX ) || defined(CONFIG_SOC_DA8XX ) || \ - defined(CONFIG_TI814X ) + defined(CONFIG_TI81XX )/* /16 is proper to hit 115200 with 48MHz */ serial_out (0 , &com_port->mdr1);
spl/Makefile +1 -1
@@ -84,7 +84,7 @@ LIBS-$(CONFIG_SPL_ETH_SUPPORT) += drivers/net/phy/libphy.o LIBS-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += drivers/usb/musb-new/libusb_musb-new.o LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/libusb_gadget.o -ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI814X),) +ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI81XX),) LIBS-y += $(CPUDIR)/omap-common/libomap-common.o endif
Signature · 1 line
1.7.10.4
PATCH v5 1/3 Prepare for TI816X : reuse existing code from TI814X
Dear "TENART Antoine",
Quoted 12 lines · In message <[email protected]> you…
Rename some
CONFIG_TI814Xto a more genericCONFIG_81XXSigned-off-by Antoine Tenart <[email protected]>--- Makefile | 2 +- arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/omap-common/Makefile | 2 +- arch/arm/include/asm/arch-am33xx/cpu.h | 2 +- arch/arm/include/asm/arch-am33xx/omap.h | 2 +- drivers/serial/ns16550.c | 4 ++-- spl/Makefile | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-)
Hmmm... should not any boards that used to set CONFIG_TI814X in their board config files (ti814x_evm) now also set CONFIG_TI81XX ?
As is, with this patch applied, these boards will probably not build any more, or at least not work any more.
Please also fix the typo in the commit message:
s/CONFIG_81XX/CONFIG_TI81XX/
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de The only way you could make a happy marriage is by cuttin' their heads off as soon as they say `I do', yes? You can't make happi- ness... - Terry Pratchett, _Witches Abroad_
PATCH v5 1/3 Prepare for TI816X : reuse existing code from TI814X
Dear Wolfgang,
Quoted 2 lines
Hmmm... should not any boards that used to set
CONFIG_TI814Xin their board config files (ti814x_evm) now also setCONFIG_TI81XX?
ti814x_evm already has it.
No other board use CONFIG_TI814X.
Quoted 2 lines
Please also fix the typo in the commit message:
s/CONFIG_81XX/CONFIG_TI81XX/
Right, I'll fix that.
Regards,
Signature · 1 line
Antoine
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v5 1/3 Prepare for TI816X : reuse existing code from TI814X
Dear "TENART Antoine",
Quoted 7 lines · In message <[email protected]> you…
Dear Wolfgang,
Quoted 2 lines
Hmmm... should not any boards that used to set
CONFIG_TI814Xin their board config files (ti814x_evm) now also setCONFIG_TI81XX?
ti814x_evmalready has it.
No other board useCONFIG_TI814X.
I see, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Time is a drug. Too much of it kills you.
- Terry Pratchett, _Small Gods_PATCH v5 2/3 Add TI816X support
In reply to a message not in the archive--- arch/arm/cpu/armv7/am33xx/Makefile | 1 + arch/arm/cpu/armv7/am33xx/clock_ti814x.c | 95 ----- arch/arm/cpu/armv7/am33xx/clock_ti816x.c | 445 ++++++++++++++++++++ arch/arm/cpu/armv7/am33xx/emif4.c | 2 + arch/arm/include/asm/arch-am33xx/clock.h | 4 + arch/arm/include/asm/arch-am33xx/clock_ti81xx.h | 142 +++++++ arch/arm/include/asm/arch-am33xx/ddr_defs.h | 35 +- arch/arm/include/asm/arch-am33xx/hardware.h | 10 +- arch/arm/include/asm/arch-am33xx/hardware_am33xx.h | 6 + arch/arm/include/asm/arch-am33xx/hardware_ti814x.h | 6 + arch/arm/include/asm/arch-am33xx/hardware_ti816x.h | 57 +++ arch/arm/include/asm/arch-am33xx/mmc_host_def.h | 3 + arch/arm/include/asm/arch-am33xx/mux.h | 2 + arch/arm/include/asm/arch-am33xx/mux_ti816x.h | 363 ++++++++++++++++ arch/arm/include/asm/arch-am33xx/spl.h | 11 +- 15 files changed, 1065 insertions(+), 117 deletions(-) create mode 100644 arch/arm/cpu/armv7/am33xx/clock_ti816x.c create mode 100644 arch/arm/include/asm/arch-am33xx/clock_ti81xx.h create mode 100644 arch/arm/include/asm/arch-am33xx/hardware_ti816x.h create mode 100644 arch/arm/include/asm/arch-am33xx/mux_ti816x.h
arch/arm/cpu/armv7/am33xx/Makefile +1 -0
@@ -18,6 +18,7 @@ LIB = $(obj)lib$(SOC).o COBJS-$(CONFIG_AM33XX) += clock_am33xx.o COBJS-$(CONFIG_TI814X) += clock_ti814x.o +COBJS-$(CONFIG_TI816X) += clock_ti816x.o COBJS-$(CONFIG_AM33XX) += clock.o COBJS += sys_info.o COBJS += mem.o
arch/arm/cpu/armv7/am33xx/clock_ti814x.c +0 -95
103 lines not on this page · raw message
arch/arm/cpu/armv7/am33xx/clock_ti816x.c new file +445 -0
445 lines not on this page · raw message
arch/arm/cpu/armv7/am33xx/emif4.c +2 -0
@@ -94,7 +94,9 @@ void config_ddr(unsigned int pll, unsigned int ioctrl, const struct emif_regs *regs, int nr) {ddr_pll_config (pll ); +#ifndef CONFIG_TI816X config_vtp (nr); +#endif config_cmd_ctrl (ctrl, nr);config_ddr_data (data, nr);
arch/arm/include/asm/arch-am33xx/clock.h +4 -0
@@ -21,6 +21,10 @@#include <asm/arch/clocks_am33xx.h> +#ifdef CONFIG_TI81XX +#include <asm/arch/clock_ti81xx.h> +#endif +#define LDELAY 1000000/*CM_<clock_domain>__CLKCTRL */
arch/arm/include/asm/arch-am33xx/clock_ti81xx.h new file +142 -0
142 lines not on this page · raw message
arch/arm/include/asm/arch-am33xx/ddr_defs.h +22 -13
@@ -200,37 +200,46 @@ struct ddr_data_regs {* correspond to DATA1 registers defined here. */ struct ddr_regs { -unsigned int resv0[7 ]; -unsigned int cm0csratio;/* offset 0x01C */ +unsigned int resv0[3 ]; +unsigned int cm0config;/* offset 0x00C */ +unsigned int cm0configclk;/* offset 0x010 */ unsigned int resv1[2 ]; +unsigned int cm0csratio;/* offset 0x01C */ +unsigned int resv2[2 ];unsigned int cm0dldiff;/* offset 0x028 */ unsigned int cm0iclkout;/* offset 0x02C */ -unsigned int resv2[8 ]; +unsigned int resv3[4 ]; +unsigned int cm1config;/* offset 0x040 */ +unsigned int cm1configclk;/* offset 0x044 */ +unsigned int resv4[2 ];unsigned int cm1csratio;/* offset 0x050 */ -unsigned int resv3[2 ]; +unsigned int resv5[2 ];unsigned int cm1dldiff;/* offset 0x05C */ unsigned int cm1iclkout;/* offset 0x060 */ -unsigned int resv4[8 ]; +unsigned int resv6[4 ]; +unsigned int cm2config;/* offset 0x074 */ +unsigned int cm2configclk;/* offset 0x078 */ +unsigned int resv7[2 ];unsigned int cm2csratio;/* offset 0x084 */ -unsigned int resv5[2 ]; +unsigned int resv8[2 ];unsigned int cm2dldiff;/* offset 0x090 */ unsigned int cm2iclkout;/* offset 0x094 */ -unsigned int resv6[12 ]; +unsigned int resv9[12 ];unsigned int dt0rdsratio0;/* offset 0x0C8 */ -unsigned int resv7[4 ]; +unsigned int resv10[4 ];unsigned int dt0wdsratio0;/* offset 0x0DC */ -unsigned int resv8[4 ]; +unsigned int resv11[4 ];unsigned int dt0wiratio0;/* offset 0x0F0 */ -unsigned int resv9; +unsigned int resv12;unsigned int dt0wimode0;/* offset 0x0F8 */ unsigned int dt0giratio0;/* offset 0x0FC */ -unsigned int resv10; +unsigned int resv13;unsigned int dt0gimode0;/* offset 0x104 */ unsigned int dt0fwsratio0;/* offset 0x108 */ -unsigned int resv11[4 ]; +unsigned int resv14[4 ];unsigned int dt0dqoffset;/* offset 0x11C */ unsigned int dt0wrsratio0;/* offset 0x120 */ -unsigned int resv12[4 ]; +unsigned int resv15[4 ];unsigned int dt0rdelays0;/* offset 0x134 */ unsigned int dt0dldiff0;/* offset 0x138 */ };
arch/arm/include/asm/arch-am33xx/hardware.h +2 -8
@@ -23,6 +23,8 @@#include <asm/arch/omap.h> #ifdef CONFIG_AM33XX #include <asm/arch/hardware_am33xx.h> +#elif defined(CONFIG_TI816X ) +#include <asm/arch/hardware_ti816x.h> #elif defined(CONFIG_TI814X )#include <asm/arch/hardware_ti814x.h> #endif
@@ -61,21 +63,13 @@#define CM_CEFUSE 0x44E00A00#define PRM_DEVICE 0x44E00F00 -/* VTP Base address */ -#define VTP1_CTRL_ADDR 0x48140E10 -/* DDR Base address */ #define DDR_CTRL_ADDR 0x44E10E04#define DDR_CONTROL_BASE_ADDR 0x44E11404 -#define DDR_PHY_CMD_ADDR2 0x47C0C800 -#define DDR_PHY_DATA_ADDR2 0x47C0C8C8/* UART */ #define DEFAULT_UART_BASE UART0_BASE -#define DDRPHY_0_CONFIG_BASE (CTRL_BASE + 0x1400) -#define DDRPHY_CONFIG_BASE DDRPHY_0_CONFIG_BASE -/* GPMC Base address */ #define GPMC_BASE 0x50000000
arch/arm/include/asm/arch-am33xx/hardware_am33xx.h +6 -0
@@ -39,12 +39,18 @@/* VTP Base address */ #define VTP0_CTRL_ADDR 0x44E10E0C +#define VTP1_CTRL_ADDR 0x48140E10/* DDR Base address */ #define DDR_PHY_CMD_ADDR 0x44E12000#define DDR_PHY_DATA_ADDR 0x44E120C8 +#define DDR_PHY_CMD_ADDR2 0x47C0C800 +#define DDR_PHY_DATA_ADDR2 0x47C0C8C8#define DDR_DATA_REGS_NR 2 +#define DDRPHY_0_CONFIG_BASE (CTRL_BASE + 0x1400) +#define DDRPHY_CONFIG_BASE DDRPHY_0_CONFIG_BASE +/* CPSW Config space */ #define CPSW_MDIO_BASE 0x4A101000
arch/arm/include/asm/arch-am33xx/hardware_ti814x.h +6 -0
@@ -39,12 +39,18 @@/* VTP Base address */ #define VTP0_CTRL_ADDR 0x48140E0C +#define VTP1_CTRL_ADDR 0x48140E10/* DDR Base address */ #define DDR_PHY_CMD_ADDR 0x47C0C400#define DDR_PHY_DATA_ADDR 0x47C0C4C8 +#define DDR_PHY_CMD_ADDR2 0x47C0C800 +#define DDR_PHY_DATA_ADDR2 0x47C0C8C8#define DDR_DATA_REGS_NR 4 +#define DDRPHY_0_CONFIG_BASE (CTRL_BASE + 0x1400) +#define DDRPHY_CONFIG_BASE DDRPHY_0_CONFIG_BASE +/* CPSW Config space */ #define CPSW_MDIO_BASE 0x4A100800
arch/arm/include/asm/arch-am33xx/hardware_ti816x.h new file +57 -0
57 lines not on this page · raw message
arch/arm/include/asm/arch-am33xx/mmc_host_def.h +3 -0
@@ -27,6 +27,9 @@#if defined(CONFIG_TI814X )#undef MMC_CLOCK_REFERENCE#define MMC_CLOCK_REFERENCE 192/* MHz */ +#elif defined(CONFIG_TI816X ) +#undef MMC_CLOCK_REFERENCE +#define MMC_CLOCK_REFERENCE 48/* MHz */ #endif #endif /* MMC_HOST_DEF_H */
arch/arm/include/asm/arch-am33xx/mux.h +2 -0
@@ -23,6 +23,8 @@#include <asm/arch/mux_am33xx.h> #elif defined(CONFIG_TI814X )#include <asm/arch/mux_ti814x.h> +#elif defined(CONFIG_TI816X ) +#include <asm/arch/mux_ti816x.h> #endif struct module_pin_mux {
arch/arm/include/asm/arch-am33xx/mux_ti816x.h new file +363 -0
363 lines not on this page · raw message
arch/arm/include/asm/arch-am33xx/spl.h +10 -1
@@ -23,6 +23,14 @@#ifndef _ASM_ARCH_SPL_H_#define _ASM_SPL_H_ +#if defined(CONFIG_TI816X ) +#define BOOT_DEVICE_XIP 2 +#define BOOT_DEVICE_NAND 3 +#define BOOT_DEVICE_MMC1 6 +#define BOOT_DEVICE_MMC2 5 +#define BOOT_DEVICE_UART 0x43 +#define BOOT_DEVICE_MMC2_2 0xFF +#else #define BOOT_DEVICE_XIP 2#define BOOT_DEVICE_NAND 5#ifdef CONFIG_AM33XX
@@ -37,11 +45,12 @@#define BOOT_DEVICE_USBETH 68#define BOOT_DEVICE_CPGMAC 70#define BOOT_DEVICE_MMC2_2 0xFF +#endif #ifdef CONFIG_AM33XX #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1#define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC2 -#elif defined(CONFIG_TI814X ) +#elif defined(CONFIG_TI81XX )#define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC2#define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC1#endif
Signature · 1 line
1.7.10.4
PATCH v5 3/3 Add TI816X evm board support
In reply to a message not in the archive--- MAINTAINERS | 4 + board/ti/ti816x/Makefile | 47 +++++++++ board/ti/ti816x/evm.c | 229 ++++++++++++++++++++++++++++++++++++++++++ boards.cfg | 1 + include/configs/ti816x_evm.h | 180 +++++++++++++++++++++++++++++++++ 5 files changed, 461 insertions(+) create mode 100644 board/ti/ti816x/Makefile create mode 100644 board/ti/ti816x/evm.c create mode 100644 include/configs/ti816x_evm.h
MAINTAINERS +4 -0
@@ -940,6 +940,10 @@ Lucas Stach <[email protected]> colibri_t20_iris Tegra20 (ARM7 & A9 Dual Core) +Antoine Tenart <[email protected]> + + TI816X ARM ARMV7 (TI816x Soc) + Nick Thompson <[email protected]> da830evm ARM926EJS (DA830/OMAP-L137)
board/ti/ti816x/Makefile new file +47 -0
47 lines not on this page · raw message
board/ti/ti816x/evm.c new file +229 -0
229 lines not on this page · raw message
boards.cfg +1 -0
@@ -250,6 +250,7 @@ am335x_evm_uart4 arm armv7 am335x ti am335x_evm_uart5 arm armv7 am335x ti am33xx am335x_evm:SERIAL6,CONS_INDEX=6 am335x_evm_usbspl arm armv7 am335x ti am33xx am335x_evm:SERIAL1,CONS_INDEX=1,SPL_USBETH_SUPPORT ti814x_evm arm armv7 ti814x ti am33xx +ti816x_evm arm armv7 ti816x ti am33xx pcm051 arm armv7 pcm051 phytec am33xx pcm051 sama5d3xek_mmc arm armv7 sama5d3xek atmel at91 sama5d3xek:SAMA5D3,SYS_USE_MMC sama5d3xek_nandflash arm armv7 sama5d3xek atmel at91 sama5d3xek:SAMA5D3,SYS_USE_NANDFLASH
include/configs/ti816x_evm.h new file +180 -0
180 lines not on this page · raw message
Signature · 1 line
1.7.10.4