From 87ac27bd5b02262cdca7d4701aabdfb7d9a43507 Mon Sep 17 00:00:00 2001 From: "Khoronzhuk, Ivan" Date: Wed, 29 Oct 2014 13:09:32 +0200 Subject: net: keystone_serdes: add keystone K2L SoC support Keystone2 Lamar SoC uses the same keystone SerDes driver. All Keystone2 EVM boards currently use SerDes driver, so move CONFIG_TI_KEYSTONE_SERDES to common configuration file. Acked-by: Murali Karicheri Signed-off-by: Ivan Khoronzhuk --- include/configs/ks2_evm.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/configs/ks2_evm.h') diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h index b0c91d8..7f44ea4 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -140,6 +140,9 @@ #define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE #define CONFIG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES +/* SerDes */ +#define CONFIG_TI_KEYSTONE_SERDES + /* AEMIF */ #define CONFIG_TI_AEMIF #define CONFIG_AEMIF_CNTRL_BASE KS2_AEMIF_CNTRL_BASE -- cgit v1.1 From 796bcee6d9d3deafa4cca5820a9ba9338d9af5a9 Mon Sep 17 00:00:00 2001 From: Hao Zhang Date: Wed, 29 Oct 2014 13:09:34 +0200 Subject: board: k2l_evm: add network support This patch adds network support code and enables keystone_net driver usage for k2l_evm evaluation board. Acked-by: Murali Karicheri Signed-off-by: Hao Zhang Signed-off-by: Ivan Khoronzhuk --- include/configs/ks2_evm.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/configs/ks2_evm.h') diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h index 7f44ea4..e734ebb 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -105,6 +105,7 @@ #define CONFIG_SYS_SGMII_RATESCALE 2 /* Keyston Navigator Configuration */ +#define CONFIG_TI_KSNAV #define CONFIG_KSNAV_QM_BASE_ADDRESS KS2_QM_BASE_ADDRESS #define CONFIG_KSNAV_QM_CONF_BASE KS2_QM_CONF_BASE #define CONFIG_KSNAV_QM_DESC_SETUP_BASE KS2_QM_DESC_SETUP_BASE @@ -121,6 +122,7 @@ #define CONFIG_KSNAV_QM_QPOOL_NUM KS2_QM_QPOOL_NUM /* NETCP pktdma */ +#define CONFIG_KSNAV_PKTDMA_NETCP #define CONFIG_KSNAV_NETCP_PDMA_CTRL_BASE KS2_NETCP_PDMA_CTRL_BASE #define CONFIG_KSNAV_NETCP_PDMA_TX_BASE KS2_NETCP_PDMA_TX_BASE #define CONFIG_KSNAV_NETCP_PDMA_TX_CH_NUM KS2_NETCP_PDMA_TX_CH_NUM @@ -134,6 +136,7 @@ #define CONFIG_KSNAV_NETCP_PDMA_TX_SND_QUEUE KS2_NETCP_PDMA_TX_SND_QUEUE /* Keystone net */ +#define CONFIG_DRIVER_TI_KEYSTONE_NET #define CONFIG_KSNET_MAC_ID_BASE KS2_MAC_ID_BASE_ADDR #define CONFIG_KSNET_NETCP_BASE KS2_NETCP_BASE #define CONFIG_KSNET_SERDES_SGMII_BASE KS2_SGMII_SERDES_BASE -- cgit v1.1 From ff52e3b4306dc1f7f1c3e60802fba84acad66ce8 Mon Sep 17 00:00:00 2001 From: "Khoronzhuk, Ivan" Date: Mon, 3 Nov 2014 18:09:51 +0200 Subject: ks2_evm: configs: fix UBI volume name The UBI volume name has to be prefixed with "ubi:". Signed-off-by: Ivan Khoronzhuk Reviewed-by: Tom Rini --- include/configs/ks2_evm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/configs/ks2_evm.h') diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h index e734ebb..7157b78 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -268,7 +268,7 @@ "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;" \ + "ubi part ubifs; ubifsmount ubi:boot;" \ "ubifsload ${addr_secdb_key} securedb.key.bin;\0" \ "get_fdt_net=dhcp ${addr_fdt} ${tftp_root}/${name_fdt}\0" \ "get_fdt_ubi=ubifsload ${addr_fdt} ${name_fdt}\0" \ -- cgit v1.1 From b7d9f9ca9e5584734b7dbc1ba8bb17ef04ffad59 Mon Sep 17 00:00:00 2001 From: Murali Karicheri Date: Mon, 3 Nov 2014 18:09:52 +0200 Subject: keystone2: change default boot mode to ubi To allow out of box demo, change default boot mode to ubi boot now that NAND is functional in latest EVMs. Signed-off-by: Murali Karicheri Signed-off-by: Ivan Khoronzhuk Reviewed-by: Tom Rini --- include/configs/ks2_evm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/configs/ks2_evm.h') diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h index 7157b78..0446e34 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -245,7 +245,7 @@ #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTFILE "uImage" #define CONFIG_EXTRA_ENV_SETTINGS \ - "boot=ramfs\0" \ + "boot=ubi\0" \ "tftp_root=/\0" \ "nfs_root=/export\0" \ "mem_lpae=1\0" \ -- cgit v1.1 From 349c26dd06c95f07973440199b1d885db23452cb Mon Sep 17 00:00:00 2001 From: Murali Karicheri Date: Tue, 4 Nov 2014 16:52:34 +0200 Subject: keystone2: config: restructure handling of default env settings Currently to customize env for various ks2 boards, individual variables such as NAME_FS etc are defined and included in the common config.h to define CONFIG_EXTRA_ENV_SETTINGS. This doesn't scale well if a variable is not applicable on a specific board. Using this scheme, we have to define variables with empty value and it's ugly. Instead, to allow board specific customization of default env variable, define a common CONFIG_EXTRA_ENV_KS2_SETTINGS for all common variables and define board specific variables in individual board specific config.h using CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS. Use the common and board specific variables to define CONFIG_EXTRA_ENV_SETTINGS. This way more variables can be added in future for individual boards without affecting the other config.h files. Signed-off-by: Murali Karicheri Signed-off-by: Ivan Khoronzhuk Reviewed-by: Tom Rini --- include/configs/ks2_evm.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'include/configs/ks2_evm.h') diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h index 0446e34..def5274 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -245,6 +245,7 @@ #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTFILE "uImage" #define CONFIG_EXTRA_ENV_SETTINGS \ + CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ "boot=ubi\0" \ "tftp_root=/\0" \ "nfs_root=/export\0" \ @@ -252,18 +253,13 @@ "mem_reserve=512M\0" \ "addr_fdt=0x87000000\0" \ "addr_kern=0x88000000\0" \ - KS2_ADDR_MON \ "addr_uboot=0x87000000\0" \ "addr_fs=0x82000000\0" \ "addr_ubi=0x82000000\0" \ "addr_secdb_key=0xc000000\0" \ "fdt_high=0xffffffff\0" \ - KS2_FDT_NAME \ "name_fs=arago-console-image.cpio.gz\0" \ "name_kern=uImage\0" \ - KS2_NAME_MON \ - NAME_UBOOT \ - NAME_UBI \ "run_mon=mon_install ${addr_mon}\0" \ "run_kern=bootm ${addr_kern} - ${addr_fdt}\0" \ "init_net=run args_all args_net\0" \ @@ -282,7 +278,6 @@ "burn_uboot_nand=nand erase 0 0x100000; " \ "nand write ${addr_uboot} 0 ${filesize}\0" \ "args_all=setenv bootargs console=ttyS0,115200n8 rootwait=1\0" \ - KS2_ARGS_UBI \ "args_net=setenv bootargs ${bootargs} rootfstype=nfs " \ "root=/dev/nfs rw nfsroot=${serverip}:${nfs_root}," \ "${nfs_options} ip=dhcp\0" \ -- cgit v1.1 From dd31079edef6703a2ed0e5b1747b2db19e3ec13c Mon Sep 17 00:00:00 2001 From: "Khoronzhuk, Ivan" Date: Tue, 4 Nov 2014 16:52:35 +0200 Subject: keystone2: config: align names of images with MCSDK The Multicore Software Development Kit (MCSDK) provides foundational software for TI KeyStone II device platforms. It's supposed to be used with uboot, and it's convenient to have the same names for images, so correct environment image names according to the last MCSDK3. Signed-off-by: Ivan Khoronzhuk Reviewed-by: Tom Rini --- include/configs/ks2_evm.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/configs/ks2_evm.h') diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h index def5274..39973e8 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -258,8 +258,7 @@ "addr_ubi=0x82000000\0" \ "addr_secdb_key=0xc000000\0" \ "fdt_high=0xffffffff\0" \ - "name_fs=arago-console-image.cpio.gz\0" \ - "name_kern=uImage\0" \ + "name_kern=uImage-keystone-evm.bin\0" \ "run_mon=mon_install ${addr_mon}\0" \ "run_kern=bootm ${addr_kern} - ${addr_fdt}\0" \ "init_net=run args_all args_net\0" \ -- cgit v1.1 From 15bbafadda49919c09fc7f9c5b9e21f29238874e Mon Sep 17 00:00:00 2001 From: "Khoronzhuk, Ivan" Date: Tue, 4 Nov 2014 18:06:27 +0200 Subject: ks2_evm: config: enable fatload command The keystone2 evm can boot from USB partition with FAT32 FS, so enable generic load command and fatload command usage. Acked-by: Murali Karicheri Signed-off-by: Ivan Khoronzhuk Reviewed-by: Tom Rini --- include/configs/ks2_evm.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/configs/ks2_evm.h') diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h index 39973e8..dd5050f 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -224,6 +224,8 @@ #define CONFIG_CMD_SF #define CONFIG_CMD_EEPROM #define CONFIG_CMD_USB +#define CONFIG_CMD_FAT +#define CONFIG_CMD_FS_GENERIC /* U-Boot general configuration */ #define CONFIG_SYS_GENERIC_BOARD -- cgit v1.1