zynqmp: Kconfig: Move zynqmp Kconfig
Subsystems (2)
PATCH 1/4 zynqmp: Kconfig: Move zynqmp Kconfig
Move the zynqmp Kconfig from board to arch
as there may be different boards under same
architecture.
---
arch/arm/Kconfig | 3 ++-
.../xilinx => arch/arm/cpu/armv8}/zynqmp/Kconfig | 0
2 files changed, 2 insertions(+), 1 deletions(-)
rename {board/xilinx => arch/arm/cpu/armv8}/zynqmp/Kconfig (100%)arch/arm/Kconfig +2 -1
@@ -850,6 +850,8 @@ source "arch/arm/mach-zynq/Kconfig" source "arch/arm/cpu/armv7/Kconfig" +source "arch/arm/cpu/armv8/zynqmp/Kconfig" + source "arch/arm/cpu/armv8/Kconfig" source "arch/arm/imx-common/Kconfig"
@@ -967,7 +969,6 @@ source "board/warp/Kconfig" source "board/woodburn/Kconfig" source "board/work-microwave/work_92105/Kconfig" source "board/xaeniax/Kconfig" -source "board/xilinx/zynqmp/Kconfig" source "board/zipitz2/Kconfig" source "arch/arm/Kconfig.debug"
arch/arm/cpu/armv8/zynqmp/Kconfig renamed from board/xilinx/zynqmp/Kconfig +0 -0
Signature · 1 line
1.7.1
PATCH 2/4 zynqmp: Define ep config for ZynqMP
Define a new config "zynqmp_ep" for ZynqMP instead of xilinx_zynqmp. This defconfig supports all emulation platforms of ZynqMP. Also renamed TARGET_XILINX_ZYNQMP to ARCH_ZYNQMP.
---
arch/arm/Kconfig | 2 +-
arch/arm/cpu/armv8/Makefile | 2 +-
arch/arm/cpu/armv8/zynqmp/Kconfig | 12 +++++++-
...xilinx_zynqmp_defconfig => zynqmp_ep_defconfig} | 5 ++-
include/configs/xilinx_zynqmp.h | 8 -----
include/configs/zynqmp_ep.h | 29 ++++++++++++++++++++
6 files changed, 44 insertions(+), 14 deletions(-)
rename configs/{xilinx_zynqmp_defconfig => zynqmp_ep_defconfig} (71%)
create mode 100644 include/configs/zynqmp_ep.harch/arm/Kconfig +1 -1
@@ -659,7 +659,7 @@ config ARCH_ZYNQ select SUPPORT_SPL select DM -config TARGET_XILINX_ZYNQMP +config ARCH_ZYNQMP bool "Support Xilinx ZynqMP Platform" select ARM64
arch/arm/cpu/armv8/Makefile +1 -1
@@ -16,4 +16,4 @@ obj-y += tlb.o obj-y += transition.o obj-$(CONFIG_FSL_LSCH3) += fsl-lsch3/ -obj-$(CONFIG_TARGET_XILINX_ZYNQMP) += zynqmp/ +obj-$(CONFIG_ARCH_ZYNQMP) += zynqmp/
arch/arm/cpu/armv8/zynqmp/Kconfig +10 -2
@@ -1,4 +1,12 @@ -if TARGET_XILINX_ZYNQMP +if ARCH_ZYNQMP + +choice + prompt "Xilinx ZynqMP board select" + +config TARGET_ZYNQMP_EP + bool "ZynqMP EP Board" + +endchoice config SYS_BOARD default "zynqmp"
@@ -10,6 +18,6 @@ config SYS_SOC default "zynqmp" config SYS_CONFIG_NAME - default "xilinx_zynqmp" + default "zynqmp_ep" if TARGET_ZYNQMP_EP endif
configs/zynqmp_ep_defconfig renamed from configs/xilinx_zynqmp_defconfig +3 -2
@@ -1,6 +1,7 @@ CONFIG_ARM=y -CONFIG_TARGET_XILINX_ZYNQMP=y -CONFIG_DEFAULT_DEVICE_TREE="zynqmp" +CONFIG_ARCH_ZYNQMP=y +CONFIG_TARGET_ZYNQMP_EP=y +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep" CONFIG_CMD_BDI=y CONFIG_CMD_BOOTD=y CONFIG_CMD_RUN=y
include/configs/xilinx_zynqmp.h +0 -8
@@ -53,7 +53,6 @@#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 0x400000)/* Serial setup */ -#define CONFIG_ZYNQ_SERIAL_UART0 #define CONFIG_ZYNQ_SERIAL #define CONFIG_CONS_INDEX 0
@@ -61,8 +60,6 @@#define CONFIG_SYS_BAUDRATE_TABLE \ { 4800, 9600, 19200, 38400, 57600, 115200 } -#define CONFIG_ZYNQ_SDHCI0 -/* Command line configuration */ #define CONFIG_CMD_ENV #define CONFIG_CMD_EXT2
@@ -129,9 +126,6 @@#define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_MAXARGS 64 -#define CONFIG_ZYNQ_I2C0 -#define CONFIG_SYS_I2C_ZYNQ -/* I2C */ #if defined(CONFIG_SYS_I2C_ZYNQ )# define CONFIG_CMD_I2C
@@ -140,8 +134,6 @@# define CONFIG_SYS_I2C_ZYNQ_SLAVE 0#endif -#define CONFIG_ZYNQMP_EEPROM -/* EEPROM */ #ifdef CONFIG_ZYNQMP_EEPROM # define CONFIG_CMD_EEPROM
include/configs/zynqmp_ep.h new file +29 -0
@@ -0,0 +1,29 @@ +/* +* Configuration for Xilinx ZynqMP emulation +* platforms. See zynqmp-common.h for ZynqMP +* common configs +* +* (C) Copyright 2014 - 2015 Xilinx, Inc. +* Michal Simek <[email protected]> +* Siva Durga Prasad Paladugu <[email protected]> +* +* Based on Configuration for Versatile Express +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef __CONFIG_ZYNQMP_EP_H +#define __CONFIG_ZYNQMP_EP_H + +#define CONFIG_ZYNQ_GEM0 +#define CONFIG_ZYNQ_GEM_PHY_ADDR0 7 + +#define CONFIG_ZYNQ_SERIAL_UART0 +#define CONFIG_ZYNQ_SDHCI0 +#define CONFIG_ZYNQ_I2C0 +#define CONFIG_SYS_I2C_ZYNQ +#define CONFIG_ZYNQ_EEPROM + +#include <configs/xilinx_zynqmp.h> + +#endif /* __CONFIG_ZYNQMP_EP_H */
Signature · 1 line
1.7.1
PATCH 3/4 Kconfig: zynqMP: Move CONFIG_SYS_TEXT_BASE to defconfig
In reply to Siva Durga Prasad PaladuguMove CONFIG_SYS_TEXT_BASE of ZynqMP_ep to its
respective defconfig
--- Kconfig | 2 +- configs/zynqmp_ep_defconfig | 1 + include/configs/xilinx_zynqmp.h | 1 - 3 files changed, 2 insertions(+), 2 deletions(-)
Kconfig +1 -1
@@ -178,7 +178,7 @@ config SYS_EXTRA_OPTIONS new boards should not use this option. config SYS_TEXT_BASE - depends on SPARC || ARC || X86 || ARCH_UNIPHIER + depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP hex "Text Base" help TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
configs/zynqmp_ep_defconfig +1 -0
@@ -13,3 +13,4 @@ CONFIG_CMD_SOURCE=y CONFIG_CMD_TIME=y CONFIG_CMD_MISC=y CONFIG_CMD_TIMER=y +CONFIG_SYS_TEXT_BASE=0x8000000
include/configs/xilinx_zynqmp.h +0 -1
@@ -40,7 +40,6 @@#define CONFIG_IDENT_STRING " Xilinx ZynqMP" -#define CONFIG_SYS_TEXT_BASE 0x8000000#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0)/* Flat Device Tree Definitions */
Signature · 1 line
1.7.1
PATCH 4/4 zynqmp: Provide option to enable uart dcc support for zynqmp
In reply to Siva Durga Prasad PaladuguProvide option to enable uart dcc support for zynqmp This config can be enabled as per board config file.
--- include/configs/xilinx_zynqmp.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
include/configs/xilinx_zynqmp.h +8 -1
@@ -52,7 +52,14 @@#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 0x400000)/* Serial setup */ -#define CONFIG_ZYNQ_SERIAL +#if defined(CONFIG_ZYNQMP_DCC ) +# define CONFIG_ARM_DCC +# define CONFIG_CPU_ARMV8 +#else +# if defined(CONFIG_ZYNQ_SERIAL_UART0 ) || defined(CONFIG_ZYNQ_SERIAL_UART1 ) +# define CONFIG_ZYNQ_SERIAL +# endif +#endif #define CONFIG_CONS_INDEX 0#define CONFIG_BAUDRATE 115200
Signature · 1 line
1.7.1
PATCH 1/4 zynqmp: Kconfig: Move zynqmp Kconfig
In reply to Siva Durga Prasad Paladuguarch/arm/cpu/armv8/zynqmp/Kconfig
Quoted 37 lines · Siva Durga Prasad Paladugu
Move the zynqmp
Kconfigfrom board to arch
as there may be different boards under same
architecture.Signed-off-by Siva Durga Prasad Paladugu <[email protected]>--- arch/arm/Kconfig | 3 ++- .../xilinx => arch/arm/cpu/armv8}/zynqmp/Kconfig | 0 2 files changed, 2 insertions(+), 1 deletions(-) rename {board/xilinx => arch/arm/cpu/armv8}/zynqmp/Kconfig (100%)arch/arm/Kconfig +2
-1@@ -850,6 +850,8 @@ source "arch/arm/mach-zynq/Kconfig" source "arch/arm/cpu/armv7/Kconfig" +source "arch/arm/cpu/armv8/zynqmp/Kconfig" + source "arch/arm/cpu/armv8/Kconfig" source "arch/arm/imx-common/Kconfig"@@ -967,7 +969,6 @@ source "board/warp/Kconfig" source "board/woodburn/Kconfig" source "board/work-microwave/work_92105/Kconfig" source "board/xaeniax/Kconfig" -source "board/xilinx/zynqmp/Kconfig" source "board/zipitz2/Kconfig" source "arch/arm/Kconfig.debug"arch/arm/cpu/armv8/zynqmp/Kconfig renamed from board/xilinx/zynqmp/Kconfig +0
-0
Masahiro/Simon: Can you see any problem with these patches? I want to make sure that we are align with your other activities.
Thanks,
Michal
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150615/e9995332/attachment.sig>
PATCH 1/4 zynqmp: Kconfig: Move zynqmp Kconfig
Hi Michal,
2015-06-15 17:53 GMT+09:00 Michal Simek <[email protected]>:
Quoted 32 lines · Siva Durga Prasad Paladugu
Quoted 31 lines
Move the zynqmp
Kconfigfrom board to arch
as there may be different boards under same
architecture.Signed-off-by Siva Durga Prasad Paladugu <[email protected]>--- arch/arm/Kconfig | 3 ++- .../xilinx => arch/arm/cpu/armv8}/zynqmp/Kconfig | 0 2 files changed, 2 insertions(+), 1 deletions(-) rename {board/xilinx => arch/arm/cpu/armv8}/zynqmp/Kconfig (100%)arch/arm/Kconfig +2
-1@@ -850,6 +850,8 @@ source "arch/arm/mach-zynq/Kconfig" source "arch/arm/cpu/armv7/Kconfig" +source "arch/arm/cpu/armv8/zynqmp/Kconfig" + source "arch/arm/cpu/armv8/Kconfig" source "arch/arm/imx-common/Kconfig"@@ -967,7 +969,6 @@ source "board/warp/Kconfig" source "board/woodburn/Kconfig" source "board/work-microwave/work_92105/Kconfig" source "board/xaeniax/Kconfig" -source "board/xilinx/zynqmp/Kconfig" source "board/zipitz2/Kconfig"
Quoted 8 lines
arch/arm/cpu/armv8/zynqmp/Kconfig
Quoted 6 lines
arch/arm/Kconfig +0
-0source "arch/arm/Kconfig.debug"arch/arm/cpu/armv8/zynqmp/Kconfig renamed from board/xilinx/zynqmp/Kconfig +0
-0Masahiro/Simon: Can you see any problem with these patches?
I do not see any problem.
Quoted 1 line
I want to make sure that we are align with your other activities.
I do not currently have any activities that could have conflicts with this series.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 1/4 zynqmp: Kconfig: Move zynqmp Kconfig
Quoted 45 lines · Masahiro Yamada
Hi Michal,
2015-06-15 17:53 GMT+09:00 Michal Simek <[email protected]>:
Quoted 32 lines · Siva Durga Prasad Paladugu
Quoted 31 lines
Move the zynqmp
Kconfigfrom board to arch
as there may be different boards under same
architecture.Signed-off-by Siva Durga Prasad Paladugu <[email protected]>--- arch/arm/Kconfig | 3 ++- .../xilinx => arch/arm/cpu/armv8}/zynqmp/Kconfig | 0 2 files changed, 2 insertions(+), 1 deletions(-) rename {board/xilinx => arch/arm/cpu/armv8}/zynqmp/Kconfig (100%)arch/arm/Kconfig +2
-1@@ -850,6 +850,8 @@ source "arch/arm/mach-zynq/Kconfig" source "arch/arm/cpu/armv7/Kconfig" +source "arch/arm/cpu/armv8/zynqmp/Kconfig" + source "arch/arm/cpu/armv8/Kconfig" source "arch/arm/imx-common/Kconfig"@@ -967,7 +969,6 @@ source "board/warp/Kconfig" source "board/woodburn/Kconfig" source "board/work-microwave/work_92105/Kconfig" source "board/xaeniax/Kconfig" -source "board/xilinx/zynqmp/Kconfig" source "board/zipitz2/Kconfig"Quoted 8 lines
arch/arm/cpu/armv8/zynqmp/Kconfig
Quoted 6 lines
arch/arm/Kconfig +0
-0source "arch/arm/Kconfig.debug"arch/arm/cpu/armv8/zynqmp/Kconfig renamed from board/xilinx/zynqmp/Kconfig +0
-0Masahiro/Simon: Can you see any problem with these patches?
Quoted 7 lines
I do not see any problem.
Quoted 1 line
I want to make sure that we are align with your other activities.
I do not currently have any activities that could have conflicts with this series.
Ok great. Will wait for Simon if he has any concern. If not, I will apply this series.
Thanks,
Michal
PATCH 1/4 zynqmp: Kconfig: Move zynqmp Kconfig
Hi Michal,
Quoted 49 lines · Michal Simek
Quoted 48 lines · Masahiro Yamada
Hi Michal,
2015-06-15 17:53 GMT+09:00 Michal Simek <[email protected]>:
Quoted 32 lines · Siva Durga Prasad Paladugu
Quoted 31 lines
Move the zynqmp
Kconfigfrom board to arch
as there may be different boards under same
architecture.Signed-off-by Siva Durga Prasad Paladugu <[email protected]>--- arch/arm/Kconfig | 3 ++- .../xilinx => arch/arm/cpu/armv8}/zynqmp/Kconfig | 0 2 files changed, 2 insertions(+), 1 deletions(-) rename {board/xilinx => arch/arm/cpu/armv8}/zynqmp/Kconfig (100%)arch/arm/Kconfig +2
-1@@ -850,6 +850,8 @@ source "arch/arm/mach-zynq/Kconfig" source "arch/arm/cpu/armv7/Kconfig" +source "arch/arm/cpu/armv8/zynqmp/Kconfig" + source "arch/arm/cpu/armv8/Kconfig" source "arch/arm/imx-common/Kconfig"@@ -967,7 +969,6 @@ source "board/warp/Kconfig" source "board/woodburn/Kconfig" source "board/work-microwave/work_92105/Kconfig" source "board/xaeniax/Kconfig" -source "board/xilinx/zynqmp/Kconfig" source "board/zipitz2/Kconfig"Quoted 8 lines
arch/arm/cpu/armv8/zynqmp/Kconfig
Quoted 6 lines
arch/arm/Kconfig +0
-0source "arch/arm/Kconfig.debug"arch/arm/cpu/armv8/zynqmp/Kconfig renamed from board/xilinx/zynqmp/Kconfig +0
-0Masahiro/Simon: Can you see any problem with these patches?
I do not see any problem.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
I want to make sure that we are align with your other activities.
I do not currently have any activities that could have conflicts with this series.
Ok great. Will wait for Simon if he has any concern. If not, I will apply this series.
LGTM.
Regards,
Simon
PATCH 1/4 zynqmp: Kconfig: Move zynqmp Kconfig
Hi,
Quoted 54 lines · Simon Glass
Hi Michal,
Quoted 51 lines · Michal Simek
Quoted 50 lines · Masahiro Yamada
Hi Michal,
2015-06-15 17:53 GMT+09:00 Michal Simek <[email protected]>:
Quoted 32 lines · Siva Durga Prasad Paladugu
Quoted 31 lines
Move the zynqmp
Kconfigfrom board to arch
as there may be different boards under same
architecture.Signed-off-by Siva Durga Prasad Paladugu <[email protected]>--- arch/arm/Kconfig | 3 ++- .../xilinx => arch/arm/cpu/armv8}/zynqmp/Kconfig | 0 2 files changed, 2 insertions(+), 1 deletions(-) rename {board/xilinx => arch/arm/cpu/armv8}/zynqmp/Kconfig (100%)arch/arm/Kconfig +2
-1@@ -850,6 +850,8 @@ source "arch/arm/mach-zynq/Kconfig" source "arch/arm/cpu/armv7/Kconfig" +source "arch/arm/cpu/armv8/zynqmp/Kconfig" + source "arch/arm/cpu/armv8/Kconfig" source "arch/arm/imx-common/Kconfig"@@ -967,7 +969,6 @@ source "board/warp/Kconfig" source "board/woodburn/Kconfig" source "board/work-microwave/work_92105/Kconfig" source "board/xaeniax/Kconfig" -source "board/xilinx/zynqmp/Kconfig" source "board/zipitz2/Kconfig"Quoted 8 lines
arch/arm/cpu/armv8/zynqmp/Kconfig
Quoted 6 lines
arch/arm/Kconfig +0
-0source "arch/arm/Kconfig.debug"arch/arm/cpu/armv8/zynqmp/Kconfig renamed from board/xilinx/zynqmp/Kconfig +0
-0Masahiro/Simon: Can you see any problem with these patches?
I do not see any problem.
Quoted 1 line
I want to make sure that we are align with your other activities.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
I do not currently have any activities that could have conflicts with this series.
Ok great. Will wait for Simon if he has any concern. If not, I will apply this series.
LGTM.
Good sign that our internal review make sense. :-) Anyway applied and will be queued for the next version.
Tom: I expect that this should to go to the next version but I am happy to send pull request for 2015.07 if you accept that.
Cheers,
Michal
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150616/5852b564/attachment.sig>