From 9e57192ccd1778124c17bb87ab8c445cd355cb8f Mon Sep 17 00:00:00 2001 From: Manjukumar Matha Date: Sun, 29 Dec 2019 23:41:44 -0800 Subject: kc705-microblaze: Update u-boot patch for kc705 Update u-boot patch for kc705 Signed-off-by: Manjukumar Matha --- ...aze-kc705-Convert-microblaze-generic-to-k.patch | 34 ++++++++++++---------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx/v2020.1/microblaze-kc705-Convert-microblaze-generic-to-k.patch b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx/v2020.1/microblaze-kc705-Convert-microblaze-generic-to-k.patch index 7e25f87c..e6190acd 100644 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx/v2020.1/microblaze-kc705-Convert-microblaze-generic-to-k.patch +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx/v2020.1/microblaze-kc705-Convert-microblaze-generic-to-k.patch @@ -1,6 +1,6 @@ -From afe880f500cff7a9486379c5ad7a4f3379015a62 Mon Sep 17 00:00:00 2001 -From: Jaewon Lee -Date: Mon, 14 Jan 2019 11:30:56 -0800 +From 31883c29633e632a70361b49de40cc71d7287041 Mon Sep 17 00:00:00 2001 +From: Manjukumar Matha +Date: Thu, 19 Dec 2019 20:09:37 -0800 Subject: [PATCH] kc705-microblazeel: Convert microblaze-generic to kc705-microblazeel @@ -17,9 +17,9 @@ Upstream-Status: Not-Upstreamable [meta-xilinx/kc705 specific] --- arch/microblaze/dts/microblaze-generic.dts | 590 ++++++++++++++++++++++++++++- board/xilinx/microblaze-generic/config.mk | 28 +- - configs/microblaze-generic_defconfig | 75 ++-- - include/configs/microblaze-generic.h | 348 ++++++++--------- - 4 files changed, 782 insertions(+), 259 deletions(-) + configs/microblaze-generic_defconfig | 77 ++-- + include/configs/microblaze-generic.h | 350 ++++++++--------- + 4 files changed, 782 insertions(+), 263 deletions(-) diff --git a/arch/microblaze/dts/microblaze-generic.dts b/arch/microblaze/dts/microblaze-generic.dts index 08a1396..f8e616b 100644 @@ -620,7 +620,7 @@ index 08a1396..f8e616b 100644 +}; + diff --git a/board/xilinx/microblaze-generic/config.mk b/board/xilinx/microblaze-generic/config.mk -index a953977..cb75fde 100644 +index a953977..0a0414a 100644 --- a/board/xilinx/microblaze-generic/config.mk +++ b/board/xilinx/microblaze-generic/config.mk @@ -1,18 +1,10 @@ @@ -653,10 +653,10 @@ index a953977..cb75fde 100644 +PLATFORM_CPPFLAGS += -mcpu=v11.0 +PLATFORM_CPPFLAGS += -fgnu89-inline diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig -index 02e62e2..8d64be4 100644 +index b88ce55..8d64be4 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig -@@ -1,73 +1,58 @@ +@@ -1,75 +1,58 @@ CONFIG_MICROBLAZE=y -CONFIG_SYS_TEXT_BASE=0x29000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -703,10 +703,12 @@ index 02e62e2..8d64be4 100644 +CONFIG_CMD_NFS=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +-CONFIG_CMD_CACHE=y CONFIG_CMD_JFFS2=y -CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y -CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic" +-CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_NETCONSOLE=y -CONFIG_SPL_DM=y +CONFIG_DM_ETH=y @@ -761,10 +763,10 @@ index 02e62e2..8d64be4 100644 +# CONFIG_BOOTARGS is not set +# CONFIG_USE_BOOTARGS is not set diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h -index ba0952c..fd1da2b 100644 +index 4d7baa7..fd1da2b 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h -@@ -1,205 +1,173 @@ +@@ -1,207 +1,173 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2007-2010 Michal Simek @@ -780,6 +782,8 @@ index ba0952c..fd1da2b 100644 -/* MicroBlaze CPU */ -#define MICROBLAZE_V5 1 - +-#define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024) +- -/* linear and spi flash memory */ -#ifdef XILINX_FLASH_START -#define FLASH @@ -959,6 +963,9 @@ index ba0952c..fd1da2b 100644 -#endif /* !SPIFLASH */ -#endif /* !FLASH */ - +-#define XILINX_USE_ICACHE 1 +-#define XILINX_USE_DCACHE 1 +- -#if defined(XILINX_USE_ICACHE) -# define CONFIG_ICACHE -#else @@ -1026,9 +1033,6 @@ index ba0952c..fd1da2b 100644 - "serial=setenv stdout serial;"\ - "setenv stdin serial\0" -#endif -- --/* Enable flat device tree support */ --#define CONFIG_LMB 1 +#define CONFIG_SYS_USR_EXCEP /* user exception */ +#define CONFIG_SYS_HZ 1000 + @@ -1129,5 +1133,5 @@ index ba0952c..fd1da2b 100644 - -#endif /* __CONFIG_H */ -- -2.7.5 +2.7.4 -- cgit v1.2.3-54-g00ecf