Add support for Keystone2 SoC and K2HK EVM
Subsystems (7)
cover Add support for Keystone2 SoC and K2HK EVM
This patch series add support for keystone2 SoC and K2HK EVM.
Following patches were reviewed before in this list and v1 of the same is send with review comments incorporated:-
- tools: mkimage: add support for gpimage format
- arm: add support for arch timer
- NAND: DaVinci: allow forced disable of subpage writes
The patch below is added as a seperate patch based on comments:-
- tools: sort the entries in Makefile
Murali Karicheri (5):
tools: sort the entries in Makefile
tools: mkimage: add support for gpimage format
NAND: DaVinci: allow forced disable of subpage writes
k2hk: add support for k2hk SOC and EVM
keystone2: net: add keystone ethernet driver
Vitaly Andrianov (2):
fdt: call ft_board_setup_ex() at the end of image_setup_libfdt()
arm: add support for arch timer
Makefile | 19 + README | 5 + arch/arm/cpu/armv7/keystone/Makefile | 19 + arch/arm/cpu/armv7/keystone/aemif.c | 79 ++ arch/arm/cpu/armv7/keystone/clock-k2hk.c | 106 +++ arch/arm/cpu/armv7/keystone/clock.c | 200 +++++ arch/arm/cpu/armv7/keystone/cmd_clock.c | 139 ++++ arch/arm/cpu/armv7/keystone/cmd_mon.c | 131 +++ arch/arm/cpu/armv7/keystone/config.mk | 14 + arch/arm/cpu/armv7/keystone/ddr3.c | 69 ++ arch/arm/cpu/armv7/keystone/init.c | 49 ++ arch/arm/cpu/armv7/keystone/keystone_nav.c | 377 +++++++++ arch/arm/cpu/armv7/keystone/lowlevel_init.S | 13 + arch/arm/cpu/armv7/keystone/msmc.c | 69 ++ arch/arm/cpu/armv7/keystone/psc.c | 240 ++++++ arch/arm/cpu/armv7/keystone/spl.c | 45 + arch/arm/include/asm/arch-keystone/clock-k2hk.h | 109 +++ arch/arm/include/asm/arch-keystone/clock.h | 17 + arch/arm/include/asm/arch-keystone/clock_defs.h | 97 +++ arch/arm/include/asm/arch-keystone/emac_defs.h | 255 ++++++ arch/arm/include/asm/arch-keystone/emif_defs.h | 75 ++ arch/arm/include/asm/arch-keystone/hardware-k2hk.h | 143 ++++ arch/arm/include/asm/arch-keystone/hardware.h | 174 ++++ arch/arm/include/asm/arch-keystone/i2c_defs.h | 86 ++ arch/arm/include/asm/arch-keystone/keystone_nav.h | 194 +++++ arch/arm/include/asm/arch-keystone/nand_defs.h | 25 + arch/arm/include/asm/arch-keystone/psc_defs.h | 91 +++ arch/arm/include/asm/arch-keystone/spl.h | 12 + arch/arm/lib/Makefile | 1 + arch/arm/lib/arch_timer.c | 58 ++ board/ti/k2hk_evm/Makefile | 9 + board/ti/k2hk_evm/README | 56 ++ board/ti/k2hk_evm/board.c | 311 +++++++ board/ti/k2hk_evm/ddr3.c | 269 ++++++ boards.cfg | 1 + common/image-fdt.c | 5 + common/image.c | 1 + drivers/i2c/Makefile | 1 + drivers/i2c/keystone_i2c.c | 372 +++++++++ drivers/mtd/nand/davinci_nand.c | 3 + drivers/net/Makefile | 1 + drivers/net/keystone_net.c | 857 ++++++++++++++++++++ drivers/serial/ns16550.c | 8 + include/configs/k2hk_evm.h | 259 ++++++ include/fdt_support.h | 1 + include/image.h | 1 + tools/Makefile | 20 +- tools/gpheader.h | 40 + tools/gpimage-common.c | 80 ++ tools/gpimage.c | 77 ++ tools/imagetool.c | 2 + tools/imagetool.h | 1 + tools/omapimage.c | 104 +-- tools/omapimage.h | 5 - 54 files changed, 5295 insertions(+), 100 deletions(-) create mode 100644 arch/arm/cpu/armv7/keystone/Makefile create mode 100644 arch/arm/cpu/armv7/keystone/aemif.c create mode 100644 arch/arm/cpu/armv7/keystone/clock-k2hk.c create mode 100644 arch/arm/cpu/armv7/keystone/clock.c create mode 100644 arch/arm/cpu/armv7/keystone/cmd_clock.c create mode 100644 arch/arm/cpu/armv7/keystone/cmd_mon.c create mode 100644 arch/arm/cpu/armv7/keystone/config.mk create mode 100644 arch/arm/cpu/armv7/keystone/ddr3.c create mode 100644 arch/arm/cpu/armv7/keystone/init.c create mode 100644 arch/arm/cpu/armv7/keystone/keystone_nav.c create mode 100644 arch/arm/cpu/armv7/keystone/lowlevel_init.S create mode 100644 arch/arm/cpu/armv7/keystone/msmc.c create mode 100644 arch/arm/cpu/armv7/keystone/psc.c create mode 100644 arch/arm/cpu/armv7/keystone/spl.c create mode 100644 arch/arm/include/asm/arch-keystone/clock-k2hk.h create mode 100644 arch/arm/include/asm/arch-keystone/clock.h create mode 100644 arch/arm/include/asm/arch-keystone/clock_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/emac_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/emif_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/hardware-k2hk.h create mode 100644 arch/arm/include/asm/arch-keystone/hardware.h create mode 100644 arch/arm/include/asm/arch-keystone/i2c_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/keystone_nav.h create mode 100644 arch/arm/include/asm/arch-keystone/nand_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/psc_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/spl.h create mode 100644 arch/arm/lib/arch_timer.c create mode 100644 board/ti/k2hk_evm/Makefile create mode 100644 board/ti/k2hk_evm/README create mode 100644 board/ti/k2hk_evm/board.c create mode 100644 board/ti/k2hk_evm/ddr3.c create mode 100644 drivers/i2c/keystone_i2c.c create mode 100644 drivers/net/keystone_net.c create mode 100644 include/configs/k2hk_evm.h create mode 100644 tools/gpheader.h create mode 100644 tools/gpimage-common.c create mode 100644 tools/gpimage.c
Signature · 1 line
1.7.9.5
PATCH 1/7 fdt: call ft_board_setup_ex() at the end of image_setup_libfdt()
From: Vitaly Andrianov <[email protected]>
The keystone2 SOC requires to fix all 32 bit aliased addresses to their 36 physical format. This has to happen after all fdt nodes are added or modified.
--- common/image-fdt.c | 5 +++++ include/fdt_support.h | 1 + 2 files changed, 6 insertions(+)
common/image-fdt.c +5 -0
@@ -487,5 +487,10 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,if (!ft_verify_fdt (blob))return -1 ; +#ifdef CONFIG_SOC_K2HK +if (IMAAGE_OF_BOARD_SETUP ) +ft_board_setup_ex (blob, gd->bd); +#endif +return 0 ; }
include/fdt_support.h +1 -0
@@ -63,6 +63,7 @@ int fdt_pci_dma_ranges(void *blob, int phb_off, struct pci_controller *hose);#endif void ft_board_setup (void *blob,bd_t *bd); +void ft_board_setup_ex (void *blob,bd_t *bd);void ft_cpu_setup (void *blob,bd_t *bd);void ft_pci_setup (void *blob,bd_t *bd);
Signature · 1 line
1.7.9.5
PATCH 2/7 tools: sort the entries in Makefile
In reply to Murali KaricheriThe NOPED_OBJ_FILES, dumpimage and mkimage object file entries are to be kept sorted. This patch fix this issue.
---
- As per review comments
tools/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
tools/Makefile +7 -7
@@ -77,10 +77,10 @@ NOPED_OBJ_FILES-y += aisimage.o NOPED_OBJ_FILES-y += default_image.o NOPED_OBJ_FILES-y += dumpimage.o NOPED_OBJ_FILES-y += fit_image.o +NOPED_OBJ_FILES-y += imagetool.o NOPED_OBJ_FILES-y += image-host.o NOPED_OBJ_FILES-y += imximage.o NOPED_OBJ_FILES-y += kwbimage.o -NOPED_OBJ_FILES-y += imagetool.o NOPED_OBJ_FILES-y += mkenvimage.o NOPED_OBJ_FILES-y += mkimage.o NOPED_OBJ_FILES-y += mxsimage.o
@@ -88,8 +88,8 @@ NOPED_OBJ_FILES-y += omapimage.o NOPED_OBJ_FILES-y += os_support.o NOPED_OBJ_FILES-y += pblimage.o NOPED_OBJ_FILES-y += proftool.o -NOPED_OBJ_FILES-y += ublimage.o NOPED_OBJ_FILES-y += relocate-rela.o +NOPED_OBJ_FILES-y += ublimage.o OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc.o OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o
@@ -209,14 +209,14 @@ $(obj)dumpimage$(SFX): $(obj)aisimage.o \ $(FIT_SIG_OBJS) \ $(obj)crc32.o \ $(obj)default_image.o \ + $(obj)dumpimage.o \ $(obj)fit_image.o \ - $(obj)image-fit.o \ $(obj)image.o \ - $(obj)image-host.o \ $(obj)imagetool.o \ + $(obj)image-fit.o \ + $(obj)image-host.o \ $(obj)imximage.o \ $(obj)kwbimage.o \ - $(obj)dumpimage.o \ $(obj)md5.o \ $(obj)mxsimage.o \ $(obj)omapimage.o \
@@ -239,10 +239,10 @@ $(obj)mkimage$(SFX): $(obj)aisimage.o \ $(obj)crc32.o \ $(obj)default_image.o \ $(obj)fit_image.o \ - $(obj)image-fit.o \ - $(obj)image-host.o \ $(obj)image.o \ $(obj)imagetool.o \ + $(obj)image-host.o \ + $(obj)image-fit.o \ $(obj)imximage.o \ $(obj)kwbimage.o \ $(obj)md5.o \
Signature · 1 line
1.7.9.5
PATCH 3/7 tools: mkimage: add support for gpimage format
In reply to Murali KaricheriThis patch add support for gpimage format as a preparatory patch for porting u-boot for keystone2 devices and is based on omapimage format. It re-uses gph header to store the size and loadaddr as done in omapimage.c
---
- Addressed review comments against initial version
- refactored the code to avoid redundant code
common/image.c | 1 + include/image.h | 1 + tools/Makefile | 6 +++ tools/gpheader.h | 40 +++++++++++++++++++ tools/gpimage-common.c | 80 +++++++++++++++++++++++++++++++++++++ tools/gpimage.c | 77 +++++++++++++++++++++++++++++++++++ tools/imagetool.c | 2 + tools/imagetool.h | 1 + tools/omapimage.c | 104 ++++++++---------------------------------------- tools/omapimage.h | 5 --- 10 files changed, 224 insertions(+), 93 deletions(-) create mode 100644 tools/gpheader.h create mode 100644 tools/gpimage-common.c create mode 100644 tools/gpimage.c
common/image.c +1 -0
@@ -124,6 +124,7 @@ static const table_entry_t uimage_type[] = { { IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image", }, { IH_TYPE_FIRMWARE, "firmware", "Firmware", }, { IH_TYPE_FLATDT, "flat_dt", "Flat Device Tree", }, + { IH_TYPE_GPIMAGE, "gpimage", "TI Keystone SPL Image",}, { IH_TYPE_KERNEL, "kernel", "Kernel Image", }, { IH_TYPE_KERNEL_NOLOAD, "kernel_noload", "Kernel Image (no loading done)", }, { IH_TYPE_KWBIMAGE, "kwbimage", "Kirkwood Boot Image",},
include/image.h +1 -0
@@ -214,6 +214,7 @@ struct lmb;#define IH_TYPE_KERNEL_NOLOAD 14/* OS Kernel Image, can run from any load address */ #define IH_TYPE_PBLIMAGE 15/* Freescale PBL Boot Image */ #define IH_TYPE_MXSIMAGE 16/* Freescale MXSBoot Image */ +#define IH_TYPE_GPIMAGE 17/* TI Keystone GPHeader Image */ /* * Compression Types
tools/Makefile +6 -0
@@ -77,6 +77,8 @@ NOPED_OBJ_FILES-y += aisimage.o NOPED_OBJ_FILES-y += default_image.o NOPED_OBJ_FILES-y += dumpimage.o NOPED_OBJ_FILES-y += fit_image.o +NOPED_OBJ_FILES-y += gpimage.o +NOPED_OBJ_FILES-y += gpimage-common.o NOPED_OBJ_FILES-y += imagetool.o NOPED_OBJ_FILES-y += image-host.o NOPED_OBJ_FILES-y += imximage.o
@@ -211,6 +213,8 @@ $(obj)dumpimage$(SFX): $(obj)aisimage.o \ $(obj)default_image.o \ $(obj)dumpimage.o \ $(obj)fit_image.o \ + $(obj)gpimage.o \ + $(obj)gpimage-common.o \ $(obj)image.o \ $(obj)imagetool.o \ $(obj)image-fit.o \
@@ -239,6 +243,8 @@ $(obj)mkimage$(SFX): $(obj)aisimage.o \ $(obj)crc32.o \ $(obj)default_image.o \ $(obj)fit_image.o \ + $(obj)gpimage.o \ + $(obj)gpimage-common.o \ $(obj)image.o \ $(obj)imagetool.o \ $(obj)image-host.o \
tools/gpheader.h new file +40 -0
@@ -0,0 +1,40 @@ +/* +* (C) Copyright 2014 +* Texas Instruments Incorporated +* Refactored common functions in to gpimage-common.c. Include this common +* header file +* +* (C) Copyright 2010 +* Linaro LTD, www.linaro.org +* Author: John Rigby <[email protected]> +* Based on TI's signGP.c +* +* (C) Copyright 2009 +* Stefano Babic, DENX Software Engineering, sbabic at denx.de. +* +* (C) Copyright 2008 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Prafulla Wadaskar <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _GPIMAGE_H_ +#define _GPIMAGE_H_ + +/* common headers for gpimage and omapimage formats */ +struct gp_header { +uint32_t size; +uint32_t load_addr; +}; +#define GPIMAGE_HDR_SIZE (sizeof(struct gp_header)) + +/* common functions across gpimage and omapimage handlers */ +int valid_gph_size (uint32_t size); +int valid_gph_load_addr (uint32_t load_addr); +int gph_verify_header (struct gp_header *gph,int be); +void gph_print_header (const struct gp_header *gph,int be); +void gph_set_header (struct gp_header *gph,uint32_t size,uint32_t load_addr, +int be); +int gpimage_check_params (struct image_tool_params *params); +#endif
tools/gpimage-common.c new file +80 -0
80 lines not on this page · raw message
tools/gpimage.c new file +77 -0
77 lines not on this page · raw message
tools/imagetool.c +2 -0
@@ -45,6 +45,8 @@ void register_image_tool(imagetool_register_t image_register)init_ubl_image_type ();/* Init Davinci AIS support */ init_ais_image_type (); +/* Init TI Keystone boot image generation/list support */ +init_gpimage_type (); }/*
tools/imagetool.h +1 -0
@@ -167,6 +167,7 @@ void init_mxs_image_type(void);void init_fit_image_type (void );void init_ubl_image_type (void );void init_omap_image_type (void ); +void init_gpimage_type (void );void pbl_load_uboot (int fd,struct image_tool_params *mparams);
tools/omapimage.c +16 -88
180 lines not on this page · raw message
tools/omapimage.h +0 -5
@@ -25,10 +25,5 @@ struct ch_settings { uint32_t flags; }; -struct gp_header { -uint32_t size; -uint32_t load_addr; -}; -#define KEY_CHSETTINGS 0xC0C0C0C1#endif /* _OMAPIMAGE_H_ */
Signature · 1 line
1.7.9.5
PATCH 4/7 arm: add support for arch timer
In reply to Murali KaricheriFrom: Vitaly Andrianov <[email protected]>
This patch add basic support for the architecture timer found on recent ARMv7 based SoCs.
---
- Resending the patch along with SoC/board patch
arch/arm/lib/Makefile | 1 + arch/arm/lib/arch_timer.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 arch/arm/lib/arch_timer.c
arch/arm/lib/Makefile +1 -0
@@ -42,6 +42,7 @@ obj-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o else obj-$(CONFIG_SPL_FRAMEWORK) += spl.o endif +obj-$(CONFIG_SYS_ARCH_TIMER) += arch_timer.o ifdef CONFIG_ARM64 obj-y += interrupts_64.o
arch/arm/lib/arch_timer.c new file +58 -0
58 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 5/7 NAND: DaVinci: allow forced disable of subpage writes
In reply to Murali KaricheriThis patch introduces a configurable mechanism to disable subpage writes in the DaVinci NAND driver.
---
- Updated README to include the option as per review comments
README | 5 +++++ drivers/mtd/nand/davinci_nand.c | 3 +++ 2 files changed, 8 insertions(+)
README +5 -0
@@ -4427,6 +4427,11 @@ Low Level (hardware related) configuration options: - CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC: Enables the RTC32K OSC on AM33xx based plattforms +- CONFIG_SYS_NAND_NO_SUBPAGE_WRITE + Option to disable subpage write in NAND driver + Example driver that use this: + drivers/mtd/nand/davinci_nand.c + Freescale QE/FMAN Firmware Support: -----------------------------------
drivers/mtd/nand/davinci_nand.c +3 -0
@@ -609,6 +609,9 @@ void davinci_nand_init(struct nand_chip *nand)#ifdef CONFIG_SYS_NAND_USE_FLASH_BBT nand->bbt_options |=NAND_BBT_USE_FLASH ;#endif +#ifdef CONFIG_SYS_NAND_NO_SUBPAGE_WRITE + nand->options |=NAND_NO_SUBPAGE_WRITE ; +#endif #ifdef CONFIG_SYS_NAND_HW_ECC nand->ecc.mode =NAND_ECC_HW ; nand->ecc.size =512 ;
Signature · 1 line
1.7.9.5
PATCH 6/7 k2hk: add support for k2hk SOC and EVM
In reply to Murali Karicherik2hk EVM is based on Texas Instruments Keystone2 Hawking/Kepler SoC. Keystone2 SoC has ARM v7 Cortex-A15 MPCore processor. Please refer the ti/k2hk_evm/README for details on the board, build and other information.
This patch add support for keystone architecture and k2hk evm.
--- Makefile | 19 + arch/arm/cpu/armv7/keystone/Makefile | 18 + arch/arm/cpu/armv7/keystone/aemif.c | 79 +++++ arch/arm/cpu/armv7/keystone/clock-k2hk.c | 106 ++++++ arch/arm/cpu/armv7/keystone/clock.c | 200 +++++++++++ arch/arm/cpu/armv7/keystone/cmd_clock.c | 139 ++++++++ arch/arm/cpu/armv7/keystone/cmd_mon.c | 131 +++++++ arch/arm/cpu/armv7/keystone/config.mk | 14 + arch/arm/cpu/armv7/keystone/ddr3.c | 69 ++++ arch/arm/cpu/armv7/keystone/init.c | 49 +++ arch/arm/cpu/armv7/keystone/lowlevel_init.S | 13 + arch/arm/cpu/armv7/keystone/msmc.c | 69 ++++ arch/arm/cpu/armv7/keystone/psc.c | 240 +++++++++++++ arch/arm/cpu/armv7/keystone/spl.c | 45 +++ arch/arm/include/asm/arch-keystone/clock-k2hk.h | 109 ++++++ arch/arm/include/asm/arch-keystone/clock.h | 17 + arch/arm/include/asm/arch-keystone/clock_defs.h | 97 +++++ arch/arm/include/asm/arch-keystone/emif_defs.h | 75 ++++ arch/arm/include/asm/arch-keystone/hardware-k2hk.h | 143 ++++++++ arch/arm/include/asm/arch-keystone/hardware.h | 174 +++++++++ arch/arm/include/asm/arch-keystone/i2c_defs.h | 86 +++++ arch/arm/include/asm/arch-keystone/nand_defs.h | 25 ++ arch/arm/include/asm/arch-keystone/psc_defs.h | 91 +++++ arch/arm/include/asm/arch-keystone/spl.h | 12 + board/ti/k2hk_evm/Makefile | 9 + board/ti/k2hk_evm/README | 56 +++ board/ti/k2hk_evm/board.c | 246 +++++++++++++ board/ti/k2hk_evm/ddr3.c | 269 ++++++++++++++ boards.cfg | 1 + drivers/i2c/Makefile | 1 + drivers/i2c/keystone_i2c.c | 372 ++++++++++++++++++++ drivers/serial/ns16550.c | 8 + include/configs/k2hk_evm.h | 221 ++++++++++++ 33 files changed, 3203 insertions(+) create mode 100644 arch/arm/cpu/armv7/keystone/Makefile create mode 100644 arch/arm/cpu/armv7/keystone/aemif.c create mode 100644 arch/arm/cpu/armv7/keystone/clock-k2hk.c create mode 100644 arch/arm/cpu/armv7/keystone/clock.c create mode 100644 arch/arm/cpu/armv7/keystone/cmd_clock.c create mode 100644 arch/arm/cpu/armv7/keystone/cmd_mon.c create mode 100644 arch/arm/cpu/armv7/keystone/config.mk create mode 100644 arch/arm/cpu/armv7/keystone/ddr3.c create mode 100644 arch/arm/cpu/armv7/keystone/init.c create mode 100644 arch/arm/cpu/armv7/keystone/lowlevel_init.S create mode 100644 arch/arm/cpu/armv7/keystone/msmc.c create mode 100644 arch/arm/cpu/armv7/keystone/psc.c create mode 100644 arch/arm/cpu/armv7/keystone/spl.c create mode 100644 arch/arm/include/asm/arch-keystone/clock-k2hk.h create mode 100644 arch/arm/include/asm/arch-keystone/clock.h create mode 100644 arch/arm/include/asm/arch-keystone/clock_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/emif_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/hardware-k2hk.h create mode 100644 arch/arm/include/asm/arch-keystone/hardware.h create mode 100644 arch/arm/include/asm/arch-keystone/i2c_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/nand_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/psc_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/spl.h create mode 100644 board/ti/k2hk_evm/Makefile create mode 100644 board/ti/k2hk_evm/README create mode 100644 board/ti/k2hk_evm/board.c create mode 100644 board/ti/k2hk_evm/ddr3.c create mode 100644 drivers/i2c/keystone_i2c.c create mode 100644 include/configs/k2hk_evm.h
Makefile +19 -0
@@ -491,6 +491,23 @@ $(obj)u-boot.spr: $(obj)u-boot.img $(obj)spl/u-boot-spl.bin --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff $@ cat $(obj)u-boot.img >> $@ +$(obj)u-boot-spi.gph: $(obj)u-boot.img $(obj)spl/u-boot-spl.bin + $(obj)tools/mkimage -A $(ARCH) -T gpimage -C none \ + -a $(CONFIG_SPL_TEXT_BASE) -e $(CONFIG_SPL_TEXT_BASE) \ + -n SPL -d $(obj)spl/u-boot-spl.bin $(obj)spl/u-boot-spl.gph + $(OBJCOPY) ${OBJCFLAGS} -I binary \ + --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0 -O binary \ + $(obj)spl/u-boot-spl.gph $(obj)spl/u-boot-spl-pad.gph + cat $(obj)spl/u-boot-spl-pad.gph $(obj)u-boot.img > $@ + +$(obj)u-boot-nand.gph: $(obj)u-boot.bin + $(obj)tools/mkimage -A $(ARCH) -T gpimage -C none \ + -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) \ + -n U-Boot -d $(obj)u-boot.bin $(obj)gph-u-boot.bin + @dd if=/dev/zero of=$(obj)zero.bin bs=8 count=1 2>/dev/null + @cat $(obj)gph-u-boot.bin $(obj)zero.bin > $@ + @rm $(obj)zero.bin + ifneq ($(CONFIG_TEGRA),) $(obj)u-boot-nodtb-tegra.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin
@@ -841,12 +858,14 @@ clobber: tidy @rm -f $(obj)u-boot.dtb @rm -f $(obj)u-boot.sb @rm -f $(obj)u-boot.spr + @rm -f $(obj)u-boot-*.gph @rm -f $(obj)nand_spl/{u-boot.{lds,lst},System.map} @rm -f $(obj)nand_spl/{u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map} @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.map} @rm -f $(obj)spl/u-boot-spl.lds @rm -f $(obj)tpl/{u-boot-tpl,u-boot-tpl.bin,u-boot-tpl.map} @rm -f $(obj)tpl/u-boot-spl.lds + @rm -f $(obj)spl/{u-boot-spl.gph,u-boot-spl-pad.gph} @rm -f $(obj)MLO MLO.byteswap @rm -f $(obj)SPL @rm -f $(obj)tools/xway-swap-bytes
arch/arm/cpu/armv7/keystone/Makefile new file +18 -0
@@ -0,0 +1,18 @@ +# +# (C) Copyright 2012-2014 +# Texas Instruments Incorporated, <www.ti.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += aemif.o +obj-y += init.o +obj-y += psc.o +obj-y += clock.o +obj-y += cmd_clock.o +obj-y += cmd_mon.o +obj-y += msmc.o +obj-y += lowlevel_init.o +obj-$(CONFIG_SPL_BUILD) += spl.o +obj-y += ddr3.o +
arch/arm/cpu/armv7/keystone/aemif.c new file +79 -0
79 lines not on this page · raw message
arch/arm/cpu/armv7/keystone/clock-k2hk.c new file +106 -0
106 lines not on this page · raw message
arch/arm/cpu/armv7/keystone/clock.c new file +200 -0
200 lines not on this page · raw message
arch/arm/cpu/armv7/keystone/cmd_clock.c new file +139 -0
139 lines not on this page · raw message
arch/arm/cpu/armv7/keystone/cmd_mon.c new file +131 -0
131 lines not on this page · raw message
arch/arm/cpu/armv7/keystone/config.mk new file +14 -0
@@ -0,0 +1,14 @@ +# (C) Copyright 2012-2014 +# Texas Instruments Incorporated, <www.ti.com> +# SPDX-License-Identifier: GPL-2.0+ +# + +PLATFORM_RELFLAGS += -fno-common -ffixed-r8 -msoft-float + +# ========================================================================= +# +# Supply options according to compiler version +# +# ========================================================================= +PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,\ + $(call cc-option,-malignment-traps,))
arch/arm/cpu/armv7/keystone/ddr3.c new file +69 -0
69 lines not on this page · raw message
arch/arm/cpu/armv7/keystone/init.c new file +49 -0
49 lines not on this page · raw message
arch/arm/cpu/armv7/keystone/lowlevel_init.S new file +13 -0
@@ -0,0 +1,13 @@ +/* + * Keystone2: Low-level pre-relocation initialization + * + * (C) Copyright 2012-2014 + * Texas Instruments Incorporated, <www.ti.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +.globl lowlevel_init +lowlevel_init: + /* nothing for now, maybe needed for more exotic boot modes */ + mov pc, lr
arch/arm/cpu/armv7/keystone/msmc.c new file +69 -0
69 lines not on this page · raw message
arch/arm/cpu/armv7/keystone/psc.c new file +240 -0
240 lines not on this page · raw message
arch/arm/cpu/armv7/keystone/spl.c new file +45 -0
45 lines not on this page · raw message
arch/arm/include/asm/arch-keystone/clock-k2hk.h new file +109 -0
109 lines not on this page · raw message
arch/arm/include/asm/arch-keystone/clock.h new file +17 -0
@@ -0,0 +1,17 @@ +/* +* keystone2: common clock header file +* +* (C) Copyright 2012-2014 +* Texas Instruments Incorporated, <www.ti.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef __ASM_ARCH_CLOCK_H +#define __ASM_ARCH_CLOCK_H + +#ifdef CONFIG_SOC_K2HK +#include <asm/arch/clock-k2hk.h> +#endif + +#endif
arch/arm/include/asm/arch-keystone/clock_defs.h new file +97 -0
97 lines not on this page · raw message
arch/arm/include/asm/arch-keystone/emif_defs.h new file +75 -0
75 lines not on this page · raw message
arch/arm/include/asm/arch-keystone/hardware-k2hk.h new file +143 -0
143 lines not on this page · raw message
arch/arm/include/asm/arch-keystone/hardware.h new file +174 -0
174 lines not on this page · raw message
arch/arm/include/asm/arch-keystone/i2c_defs.h new file +86 -0
86 lines not on this page · raw message
arch/arm/include/asm/arch-keystone/nand_defs.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* nand driver definitions to re-use davinci nand driver on Keystone2 +* +* (C) Copyright 2012-2014 +* Texas Instruments Incorporated, <www.ti.com> +* (C) Copyright 2007 Sergey Kubushyn <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ +#ifndef _NAND_DEFS_H_ +#define _NAND_DEFS_H_ + +#include <asm/arch/hardware.h> +#include <linux/mtd/nand.h> + +#define MASK_CLE 0x4000 +#define MASK_ALE 0x2000 + +#define NAND_READ_START 0x00 +#define NAND_READ_END 0x30 +#define NAND_STATUS 0x70 + +extern void davinci_nand_init (struct nand_chip *nand); + +#endif
arch/arm/include/asm/arch-keystone/psc_defs.h new file +91 -0
91 lines not on this page · raw message
arch/arm/include/asm/arch-keystone/spl.h new file +12 -0
@@ -0,0 +1,12 @@ +/* +* (C) Copyright 2012-2014 +* Texas Instruments, <www.ti.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ +#ifndef _ASM_ARCH_SPL_H_ +#define _ASM_SPL_H_ + +#define BOOT_DEVICE_SPI 2 + +#endif
board/ti/k2hk_evm/Makefile new file +9 -0
@@ -0,0 +1,9 @@ +# +# K2HK-EVM: board Makefile +# (C) Copyright 2012-2014 +# Texas Instruments Incorporated, <www.ti.com> +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += board.o +obj-y += ddr3.o
board/ti/k2hk_evm/README new file +56 -0
56 lines not on this page · raw message
board/ti/k2hk_evm/board.c new file +246 -0
246 lines not on this page · raw message
board/ti/k2hk_evm/ddr3.c new file +269 -0
269 lines not on this page · raw message
boards.cfg +1 -0
@@ -362,6 +362,7 @@ Active arm armv7 zynq xilinx zynq zynq_microzed - Active arm armv7 zynq xilinx zynq zynq_zc770_xm010 zynq_zc770:ZC770_XM010 Michal Simek <[email protected]>:Jagannadha Sutradharudu Teki <[email protected]> Active arm armv7 zynq xilinx zynq zynq_zc770_xm012 zynq_zc770:ZC770_XM012 Michal Simek <[email protected]>:Jagannadha Sutradharudu Teki <[email protected]> Active arm armv7 zynq xilinx zynq zynq_zc770_xm013 zynq_zc770:ZC770_XM013 Michal Simek <[email protected]>:Jagannadha Sutradharudu Teki <[email protected]> +Active arm armv7 keystone ti k2hk_evm k2hk_evm - Vitaly Andrianov <[email protected]> Active arm armv7:arm720t tegra114 nvidia dalmore dalmore - Tom Warren <[email protected]> Active arm armv7:arm720t tegra20 avionic-design medcom-wide medcom-wide - Alban Bedel <[email protected]> Active arm armv7:arm720t tegra20 avionic-design plutux plutux - Alban Bedel <[email protected]>
drivers/i2c/Makefile +1 -0
@@ -7,6 +7,7 @@ obj-$(CONFIG_BFIN_TWI_I2C) += bfin-twi_i2c.o obj-$(CONFIG_DRIVER_DAVINCI_I2C) += davinci_i2c.o +obj-$(CONFIG_DRIVER_KEYSTONE_I2C) += keystone_i2c.o obj-$(CONFIG_DW_I2C) += designware_i2c.o obj-$(CONFIG_I2C_MVTWSI) += mvtwsi.o obj-$(CONFIG_I2C_MV) += mv_i2c.o
drivers/i2c/keystone_i2c.c new file +372 -0
368 lines not on this page · raw message
include/configs/k2hk_evm.h new file +221 -0
221 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.9.5
Part of the diff is not shown here. View the raw message.
PATCH 7/7 keystone2: net: add keystone ethernet driver
In reply to Murali KaricheriThe network driver consists of multicore navigator driver and the ethernet sub system driver. Multicore navigator consists of Network Coprocessor (NetCP) and Queue Manager sub system. More details on the hardware can be obtained from the following links:-
Network Coprocessor: http://www.ti.com/lit/pdf/sprugz6
Multicore Navigator: http://www.ti.com/lit/pdf/sprugr9
Multicore navigator driver implements APIs to configure the Queue Manager and NetCP Pkt DMA. Ethernet driver configures the CPSW, SGMI and Phy and uses the the Navigator APIs. The driver supports 4 Ethernet ports and can work with only one port at a time.
Port configurations are defined in board.c.
--- arch/arm/cpu/armv7/keystone/Makefile | 1 + arch/arm/cpu/armv7/keystone/keystone_nav.c | 377 +++++++++ arch/arm/include/asm/arch-keystone/emac_defs.h | 255 ++++++ arch/arm/include/asm/arch-keystone/keystone_nav.h | 194 +++++ board/ti/k2hk_evm/board.c | 65 ++ drivers/net/Makefile | 1 + drivers/net/keystone_net.c | 857 +++++++++++++++++++++ include/configs/k2hk_evm.h | 38 + 8 files changed, 1788 insertions(+) create mode 100644 arch/arm/cpu/armv7/keystone/keystone_nav.c create mode 100644 arch/arm/include/asm/arch-keystone/emac_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/keystone_nav.h create mode 100644 drivers/net/keystone_net.c
arch/arm/cpu/armv7/keystone/Makefile +1 -0
@@ -11,6 +11,7 @@ obj-y += psc.o obj-y += clock.o obj-y += cmd_clock.o obj-y += cmd_mon.o +obj-y += keystone_nav.o obj-y += msmc.o obj-y += lowlevel_init.o obj-$(CONFIG_SPL_BUILD) += spl.o
arch/arm/cpu/armv7/keystone/keystone_nav.c new file +377 -0
377 lines not on this page · raw message
arch/arm/include/asm/arch-keystone/emac_defs.h new file +255 -0
255 lines not on this page · raw message
arch/arm/include/asm/arch-keystone/keystone_nav.h new file +194 -0
194 lines not on this page · raw message
board/ti/k2hk_evm/board.c +65 -0
77 lines not on this page · raw message
drivers/net/Makefile +1 -0
@@ -30,6 +30,7 @@ obj-$(CONFIG_FTMAC110) += ftmac110.o obj-$(CONFIG_FTMAC100) += ftmac100.o obj-$(CONFIG_GRETH) += greth.o obj-$(CONFIG_INCA_IP_SWITCH) += inca-ip_sw.o +obj-$(CONFIG_DRIVER_TI_KEYSTONE_NET) += keystone_net.o obj-$(CONFIG_DRIVER_KS8695ETH) += ks8695eth.o obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o obj-$(CONFIG_LAN91C96) += lan91c96.o
drivers/net/keystone_net.c new file +857 -0
857 lines not on this page · raw message
include/configs/k2hk_evm.h +38 -0
@@ -106,6 +106,23 @@#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 20#define CONFIG_ENV_EEPROM_IS_ON_I2C +/* Network Configuration */ +#define CONFIG_ETH_PHY_MARVEL_88E1111 + +#define CONFIG_DRIVER_TI_KEYSTONE_NET +#define CONFIG_MII +#define CONFIG_BOOTP_DEFAULT +#define CONFIG_BOOTP_DNS +#define CONFIG_BOOTP_DNS2 +#define CONFIG_BOOTP_SEND_HOSTNAME +#define CONFIG_NET_RETRY_COUNT 32 +#define CONFIG_NET_MULTI +#define CONFIG_GET_LINK_STATUS_ATTEMPTS 5 + +#define CONFIG_SYS_SGMII_REFCLK_MHZ 312 +#define CONFIG_SYS_SGMII_LINERATE_MHZ 1250 +#define CONFIG_SYS_SGMII_RATESCALE 2 +/* NAND Configuration */ #define CONFIG_NAND_DAVINCI #define CONFIG_SYS_NAND_CS 2
@@ -179,24 +196,45 @@"addr_fs=0x82000000\0" \"addr_ubi=0x82000000\0" \"fdt_high=0xffffffff\0" \ +"name_fdt=uImage-k2hk-evm.dtb\0" \ +"name_fs=arago-console-image.cpio.gz\0" \ +"name_kern=uImage-keystone-evm.bin\0" \ +"name_mon=skern-keystone-evm.bin\0" \ +"name_uboot=u-boot-spi-keystone-evm.gph\0" \ +"name_ubi=keystone-evm-ubifs.ubi\0" \"run_mon=mon_install ${addr_mon}\0" \"run_kern=bootm ${addr_kern} - ${addr_fdt}\0" \ +"init_net=run args_all args_net\0" \"init_ubi=run args_all args_ubi; " \"ubi part ubifs; ubifsmount boot\0" \ +"get_fdt_net=dhcp ${addr_fdt} ${tftp_root}/${name_fdt}\0" \"get_fdt_ubi=ubifsload ${addr_fdt} ${name_fdt}\0" \ +"get_kern_net=dhcp ${addr_kern} ${tftp_root}/${name_kern}\0" \"get_kern_ubi=ubifsload ${addr_kern} ${name_kern}\0" \ +"get_mon_net=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0" \"get_mon_ubi=ubifsload ${addr_mon} ${name_mon}\0" \ +"get_uboot_net=dhcp ${addr_uboot} ${tftp_root}/${name_uboot}\0" \"burn_uboot=sf probe; sf erase 0 0x100000; " \"sf write ${addr_uboot} 0 ${filesize}\0" \"args_all=setenv bootargs console=ttyS0,115200n8 rootwait=1\0" \"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \"root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,2048\0" \ +"args_net=setenv bootargs ${bootargs} rootfstype=nfs " \ +"root=/dev/nfs rw nfsroot=${serverip}:${nfs_root}," \ +"${nfs_options} ip=dhcp\0" \ +"nfs_options=v3,tcp,rsize=4096,wsize=4096\0" \ +"get_fdt_ramfs=dhcp ${addr_fdt} ${tftp_root}/${name_fdt}\0" \ +"get_kern_ramfs=dhcp ${addr_kern} ${tftp_root}/${name_kern}\0" \ +"get_mon_ramfs=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0" \ +"get_fs_ramfs=dhcp ${addr_fs} ${tftp_root}/${name_fs}\0" \ +"get_ubi_net=dhcp ${addr_ubi} ${tftp_root}/${name_ubi}\0" \"burn_ubi=nand erase.part ubifs; " \"nand write ${addr_ubi} ubifs ${filesize}\0" \"init_ramfs=run args_all args_ramfs get_fs_ramfs\0" \"args_ramfs=setenv bootargs ${bootargs} earlyprintk " \"rdinit=/sbin/init rw root=/dev/ram0 " \"initrd=0x802000000,9M\0" \ +"no_post=1\0" \"mtdparts=mtdparts=davinci_nand.0:" \"1024k(bootloader)ro,512k(params)ro,522752k(ubifs)\0" #define CONFIG_BOOTCOMMAND \
Signature · 1 line
1.7.9.5
PATCH 7/7 keystone2: net: add keystone ethernet driver
Quoted 20 lines · Murali Karicheri
The network driver consists of multicore navigator driver and the ethernet sub system driver. Multicore navigator consists of Network Coprocessor (NetCP) and Queue Manager sub system. More details on the hardware can be obtained from the following links:-
Network Coprocessor: http://www.ti.com/lit/pdf/sprugz6
Multicore Navigator: http://www.ti.com/lit/pdf/sprugr9Multicore navigator driver implements APIs to configure the Queue Manager and NetCP Pkt DMA. Ethernet driver configures the CPSW, SGMI and Phy and uses the the Navigator APIs. The driver supports 4 Ethernet ports and can work with only one port at a time.
Port configurations are defined in
board.c.Signed-off-by Vitaly Andrianov <[email protected]>Signed-off-by Murali Karicheri <[email protected]>Signed-off-by WingMan Kwok <[email protected]>
Quoted 14 lines
--- arch/arm/cpu/armv7/keystone/Makefile | 1 + arch/arm/cpu/armv7/keystone/keystone_nav.c | 377 +++++++++ arch/arm/include/asm/arch-keystone/emac_defs.h | 255 ++++++ arch/arm/include/asm/arch-keystone/keystone_nav.h | 194 +++++ board/ti/k2hk_evm/board.c | 65 ++ drivers/net/Makefile | 1 + drivers/net/keystone_net.c | 857 +++++++++++++++++++++ include/configs/k2hk_evm.h | 38 + 8 files changed, 1788 insertions(+) create mode 100644 arch/arm/cpu/armv7/keystone/keystone_nav.c create mode 100644 arch/arm/include/asm/arch-keystone/emac_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/keystone_nav.h create mode 100644 drivers/net/keystone_net.c
Please separate the patch into smaller patches like adding driver, adding Ethernet support in SoC/board files. Which will make it easier for reviewing and bisecting.
Regards
Mugunthan V N