* [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig
@ 2015-06-10 10:20 Siva Durga Prasad Paladugu
2015-06-10 10:20 ` [U-Boot] [PATCH 2/4] zynqmp: Define ep config for ZynqMP Siva Durga Prasad Paladugu
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Siva Durga Prasad Paladugu @ 2015-06-10 10:20 UTC (permalink / raw)
To: u-boot
Move the zynqmp Kconfig from board to arch
as there may be different boards under same
architecture.
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
---
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%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2985e6e..ca2c410 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/board/xilinx/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
similarity index 100%
rename from board/xilinx/zynqmp/Kconfig
rename to arch/arm/cpu/armv8/zynqmp/Kconfig
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 2/4] zynqmp: Define ep config for ZynqMP
2015-06-10 10:20 [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig Siva Durga Prasad Paladugu
@ 2015-06-10 10:20 ` Siva Durga Prasad Paladugu
2015-06-10 10:20 ` [U-Boot] [PATCH 3/4] Kconfig: zynqMP: Move CONFIG_SYS_TEXT_BASE to defconfig Siva Durga Prasad Paladugu
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Siva Durga Prasad Paladugu @ 2015-06-10 10:20 UTC (permalink / raw)
To: u-boot
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.
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
---
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.h
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ca2c410..ab2f211 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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
diff --git a/arch/arm/cpu/armv8/Makefile b/arch/arm/cpu/armv8/Makefile
index dee5e25..6466ebb 100644
--- a/arch/arm/cpu/armv8/Makefile
+++ b/arch/arm/cpu/armv8/Makefile
@@ -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/
diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
index b07932e..cf80b08 100644
--- a/arch/arm/cpu/armv8/zynqmp/Kconfig
+++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
@@ -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
diff --git a/configs/xilinx_zynqmp_defconfig b/configs/zynqmp_ep_defconfig
similarity index 71%
rename from configs/xilinx_zynqmp_defconfig
rename to configs/zynqmp_ep_defconfig
index c512e9c..6b29eca 100644
--- a/configs/xilinx_zynqmp_defconfig
+++ b/configs/zynqmp_ep_defconfig
@@ -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
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 880d29c..18cd15b 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -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
diff --git a/include/configs/zynqmp_ep.h b/include/configs/zynqmp_ep.h
new file mode 100644
index 0000000..26dd300
--- /dev/null
+++ b/include/configs/zynqmp_ep.h
@@ -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 <michal.simek@xilinx.com>
+ * Siva Durga Prasad Paladugu <sivadur@xilinx.com>
+ *
+ * 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 */
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 3/4] Kconfig: zynqMP: Move CONFIG_SYS_TEXT_BASE to defconfig
2015-06-10 10:20 [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig Siva Durga Prasad Paladugu
2015-06-10 10:20 ` [U-Boot] [PATCH 2/4] zynqmp: Define ep config for ZynqMP Siva Durga Prasad Paladugu
@ 2015-06-10 10:20 ` Siva Durga Prasad Paladugu
2015-06-10 10:20 ` [U-Boot] [PATCH 4/4] zynqmp: Provide option to enable uart dcc support for zynqmp Siva Durga Prasad Paladugu
2015-06-15 8:53 ` [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig Michal Simek
3 siblings, 0 replies; 9+ messages in thread
From: Siva Durga Prasad Paladugu @ 2015-06-10 10:20 UTC (permalink / raw)
To: u-boot
Move CONFIG_SYS_TEXT_BASE of ZynqMP_ep to its
respective defconfig
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
---
Kconfig | 2 +-
configs/zynqmp_ep_defconfig | 1 +
include/configs/xilinx_zynqmp.h | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Kconfig b/Kconfig
index 15e15af..fc69189 100644
--- a/Kconfig
+++ b/Kconfig
@@ -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
diff --git a/configs/zynqmp_ep_defconfig b/configs/zynqmp_ep_defconfig
index 6b29eca..bba62bd 100644
--- a/configs/zynqmp_ep_defconfig
+++ b/configs/zynqmp_ep_defconfig
@@ -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
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 18cd15b..8189add 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -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 */
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 4/4] zynqmp: Provide option to enable uart dcc support for zynqmp
2015-06-10 10:20 [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig Siva Durga Prasad Paladugu
2015-06-10 10:20 ` [U-Boot] [PATCH 2/4] zynqmp: Define ep config for ZynqMP Siva Durga Prasad Paladugu
2015-06-10 10:20 ` [U-Boot] [PATCH 3/4] Kconfig: zynqMP: Move CONFIG_SYS_TEXT_BASE to defconfig Siva Durga Prasad Paladugu
@ 2015-06-10 10:20 ` Siva Durga Prasad Paladugu
2015-06-15 8:53 ` [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig Michal Simek
3 siblings, 0 replies; 9+ messages in thread
From: Siva Durga Prasad Paladugu @ 2015-06-10 10:20 UTC (permalink / raw)
To: u-boot
Provide option to enable uart dcc support for zynqmp
This config can be enabled as per board config file.
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
---
include/configs/xilinx_zynqmp.h | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 8189add..2594696 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -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
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig
2015-06-10 10:20 [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig Siva Durga Prasad Paladugu
` (2 preceding siblings ...)
2015-06-10 10:20 ` [U-Boot] [PATCH 4/4] zynqmp: Provide option to enable uart dcc support for zynqmp Siva Durga Prasad Paladugu
@ 2015-06-15 8:53 ` Michal Simek
2015-06-15 9:03 ` Masahiro Yamada
3 siblings, 1 reply; 9+ messages in thread
From: Michal Simek @ 2015-06-15 8:53 UTC (permalink / raw)
To: u-boot
On 06/10/2015 12:20 PM, Siva Durga Prasad Paladugu wrote:
> Move the zynqmp Kconfig from board to arch
> as there may be different boards under same
> architecture.
>
> Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
> ---
> 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%)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 2985e6e..ca2c410 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -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"
> diff --git a/board/xilinx/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
> similarity index 100%
> rename from board/xilinx/zynqmp/Kconfig
> rename to arch/arm/cpu/armv8/zynqmp/Kconfig
>
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
--
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>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig
2015-06-15 8:53 ` [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig Michal Simek
@ 2015-06-15 9:03 ` Masahiro Yamada
2015-06-15 9:24 ` Michal Simek
0 siblings, 1 reply; 9+ messages in thread
From: Masahiro Yamada @ 2015-06-15 9:03 UTC (permalink / raw)
To: u-boot
Hi Michal,
2015-06-15 17:53 GMT+09:00 Michal Simek <monstr@monstr.eu>:
> On 06/10/2015 12:20 PM, Siva Durga Prasad Paladugu wrote:
>> Move the zynqmp Kconfig from board to arch
>> as there may be different boards under same
>> architecture.
>>
>> Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
>> ---
>> 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%)
>>
>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>> index 2985e6e..ca2c410 100644
>> --- a/arch/arm/Kconfig
>> +++ b/arch/arm/Kconfig
>> @@ -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"
>> diff --git a/board/xilinx/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
>> similarity index 100%
>> rename from board/xilinx/zynqmp/Kconfig
>> rename to arch/arm/cpu/armv8/zynqmp/Kconfig
>>
>
> Masahiro/Simon: Can you see any problem with these patches?
I do not see any problem.
> 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.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig
2015-06-15 9:03 ` Masahiro Yamada
@ 2015-06-15 9:24 ` Michal Simek
2015-06-16 2:45 ` Simon Glass
0 siblings, 1 reply; 9+ messages in thread
From: Michal Simek @ 2015-06-15 9:24 UTC (permalink / raw)
To: u-boot
On 06/15/2015 11:03 AM, Masahiro Yamada wrote:
> Hi Michal,
>
>
> 2015-06-15 17:53 GMT+09:00 Michal Simek <monstr@monstr.eu>:
>> On 06/10/2015 12:20 PM, Siva Durga Prasad Paladugu wrote:
>>> Move the zynqmp Kconfig from board to arch
>>> as there may be different boards under same
>>> architecture.
>>>
>>> Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
>>> ---
>>> 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%)
>>>
>>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>>> index 2985e6e..ca2c410 100644
>>> --- a/arch/arm/Kconfig
>>> +++ b/arch/arm/Kconfig
>>> @@ -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"
>>> diff --git a/board/xilinx/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
>>> similarity index 100%
>>> rename from board/xilinx/zynqmp/Kconfig
>>> rename to arch/arm/cpu/armv8/zynqmp/Kconfig
>>>
>>
>> Masahiro/Simon: Can you see any problem with these patches?
>
> I do not see any problem.
>
>
>> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig
2015-06-15 9:24 ` Michal Simek
@ 2015-06-16 2:45 ` Simon Glass
2015-06-16 13:59 ` Michal Simek
0 siblings, 1 reply; 9+ messages in thread
From: Simon Glass @ 2015-06-16 2:45 UTC (permalink / raw)
To: u-boot
Hi Michal,
On 15 June 2015 at 03:24, Michal Simek <michal.simek@xilinx.com> wrote:
> On 06/15/2015 11:03 AM, Masahiro Yamada wrote:
>> Hi Michal,
>>
>>
>> 2015-06-15 17:53 GMT+09:00 Michal Simek <monstr@monstr.eu>:
>>> On 06/10/2015 12:20 PM, Siva Durga Prasad Paladugu wrote:
>>>> Move the zynqmp Kconfig from board to arch
>>>> as there may be different boards under same
>>>> architecture.
>>>>
>>>> Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
>>>> ---
>>>> 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%)
>>>>
>>>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>>>> index 2985e6e..ca2c410 100644
>>>> --- a/arch/arm/Kconfig
>>>> +++ b/arch/arm/Kconfig
>>>> @@ -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"
>>>> diff --git a/board/xilinx/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
>>>> similarity index 100%
>>>> rename from board/xilinx/zynqmp/Kconfig
>>>> rename to arch/arm/cpu/armv8/zynqmp/Kconfig
>>>>
>>>
>>> Masahiro/Simon: Can you see any problem with these patches?
>>
>> I do not see any problem.
>>
>>
>>> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig
2015-06-16 2:45 ` Simon Glass
@ 2015-06-16 13:59 ` Michal Simek
0 siblings, 0 replies; 9+ messages in thread
From: Michal Simek @ 2015-06-16 13:59 UTC (permalink / raw)
To: u-boot
Hi,
On 06/16/2015 04:45 AM, Simon Glass wrote:
> Hi Michal,
>
> On 15 June 2015 at 03:24, Michal Simek <michal.simek@xilinx.com> wrote:
>> On 06/15/2015 11:03 AM, Masahiro Yamada wrote:
>>> Hi Michal,
>>>
>>>
>>> 2015-06-15 17:53 GMT+09:00 Michal Simek <monstr@monstr.eu>:
>>>> On 06/10/2015 12:20 PM, Siva Durga Prasad Paladugu wrote:
>>>>> Move the zynqmp Kconfig from board to arch
>>>>> as there may be different boards under same
>>>>> architecture.
>>>>>
>>>>> Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
>>>>> ---
>>>>> 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%)
>>>>>
>>>>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>>>>> index 2985e6e..ca2c410 100644
>>>>> --- a/arch/arm/Kconfig
>>>>> +++ b/arch/arm/Kconfig
>>>>> @@ -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"
>>>>> diff --git a/board/xilinx/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
>>>>> similarity index 100%
>>>>> rename from board/xilinx/zynqmp/Kconfig
>>>>> rename to arch/arm/cpu/armv8/zynqmp/Kconfig
>>>>>
>>>>
>>>> Masahiro/Simon: Can you see any problem with these patches?
>>>
>>> I do not see any problem.
>>>
>>>
>>>> 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.
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
--
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>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-06-16 13:59 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-10 10:20 [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig Siva Durga Prasad Paladugu
2015-06-10 10:20 ` [U-Boot] [PATCH 2/4] zynqmp: Define ep config for ZynqMP Siva Durga Prasad Paladugu
2015-06-10 10:20 ` [U-Boot] [PATCH 3/4] Kconfig: zynqMP: Move CONFIG_SYS_TEXT_BASE to defconfig Siva Durga Prasad Paladugu
2015-06-10 10:20 ` [U-Boot] [PATCH 4/4] zynqmp: Provide option to enable uart dcc support for zynqmp Siva Durga Prasad Paladugu
2015-06-15 8:53 ` [U-Boot] [PATCH 1/4] zynqmp: Kconfig: Move zynqmp Kconfig Michal Simek
2015-06-15 9:03 ` Masahiro Yamada
2015-06-15 9:24 ` Michal Simek
2015-06-16 2:45 ` Simon Glass
2015-06-16 13:59 ` Michal Simek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox