From f5cfc2f2df5c6603336382826c18555164469dda Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Tue, 29 Sep 2020 20:06:40 +0100 Subject: [PATCH] arm-bsp/u-boot: fix patches for a5ds Some of the patches for u-boot do not apply without fuzz in 2020.07, rebase them so we do not have the ugly warnings during do_patch Change-Id: I0c89b18ed66adad66c7cf41373ca7cdd3fdea3da Signed-off-by: Rui Miguel Silva Signed-off-by: Jon Mason --- .../a5ds/0001-armv7-add-mmio-timer.patch | 16 +++++----- ...-arm-add-designstart-cortex-a5-board.patch | 32 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/a5ds/0001-armv7-add-mmio-timer.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/a5ds/0001-armv7-add-mmio-timer.patch index fe61ed5d..e59afea6 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/a5ds/0001-armv7-add-mmio-timer.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/a5ds/0001-armv7-add-mmio-timer.patch @@ -1,7 +1,7 @@ -From 864749afaf9b3f71ddaa519f4a770ce43e206912 Mon Sep 17 00:00:00 2001 +From 4449a6c2de38bdeb09e3158f6d9318812966243a Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Wed, 18 Dec 2019 21:52:34 +0000 -Subject: [PATCH 1/3] armv7: add mmio timer +Subject: [PATCH 1/2] armv7: add mmio timer This timer can be used by u-boot when arch-timer is not available in core, for example, Cortex-A5. @@ -18,12 +18,12 @@ diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 8c955d0d5284..82af9c031277 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile -@@ -28,6 +28,7 @@ obj-$(CONFIG_ARMV7_PSCI) += psci.o psci-common.o +@@ -28,6 +28,7 @@ obj-$(CONFIG_ARMV7_PSCI) += psci.o psci-common.o obj-$(CONFIG_IPROC) += iproc-common/ obj-$(CONFIG_KONA) += kona-common/ obj-$(CONFIG_SYS_ARCH_TIMER) += arch_timer.o +obj-$(CONFIG_SYS_MMIO_TIMER) += mmio_timer.o - + ifneq (,$(filter s5pc1xx exynos,$(SOC))) obj-y += s5p-common/ diff --git a/arch/arm/cpu/armv7/mmio_timer.c b/arch/arm/cpu/armv7/mmio_timer.c @@ -89,10 +89,10 @@ index 000000000000..5d6f66172398 + return gd->arch.timer_rate_hz; +} diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt -index 6908431d03cf..186001ecfb8c 100644 +index 916768f361d9..c8fd8c6e355a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt -@@ -3108,6 +3108,7 @@ CONFIG_SYS_MMC_U_BOOT_DST +@@ -3075,6 +3075,7 @@ CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_MMC_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_SIZE CONFIG_SYS_MMC_U_BOOT_START @@ -100,6 +100,6 @@ index 6908431d03cf..186001ecfb8c 100644 CONFIG_SYS_MONITOR_ CONFIG_SYS_MONITOR_BASE CONFIG_SYS_MONITOR_BASE_EARLY --- -2.26.2 +-- +2.28.0 diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/a5ds/0002-board-arm-add-designstart-cortex-a5-board.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/a5ds/0002-board-arm-add-designstart-cortex-a5-board.patch index e8e10884..204bdb3c 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/a5ds/0002-board-arm-add-designstart-cortex-a5-board.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/a5ds/0002-board-arm-add-designstart-cortex-a5-board.patch @@ -1,7 +1,7 @@ -From d74c2d6f475bef05c114e859ab52bd721fbee7b2 Mon Sep 17 00:00:00 2001 +From eed15d394137616a18add204a85b0e9dd5b00e0b Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Wed, 8 Jan 2020 09:48:11 +0000 -Subject: [PATCH 2/3] board: arm: add designstart cortex-a5 board +Subject: [PATCH 2/2] board: arm: add designstart cortex-a5 board Arm added a new board, designstart, with a cortex-a5 chip, add the default configuration, initialization and makefile for this system. @@ -22,23 +22,23 @@ Signed-off-by: Rui Miguel Silva create mode 100644 include/configs/designstart_ca5.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index bbb1e2738bfe..8f918f6e0375 100644 +index 54d65f84889f..7bc12f0b4300 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -636,6 +636,12 @@ config ARCH_BCM6858 - select OF_CONTROL - imply CMD_DM - +@@ -665,6 +665,12 @@ config ARCH_BCM6858 + select OF_CONTROL + imply CMD_DM + +config TARGET_DESIGNSTART_CA5 -+ bool "Support Designstart Cortex-A5" -+ select CPU_V7A -+ select SEMIHOSTING -+ select PL01X_SERIAL ++ bool "Support Designstart Cortex-A5" ++ select CPU_V7A ++ select SEMIHOSTING ++ select PL01X_SERIAL + config TARGET_VEXPRESS_CA15_TC2 - bool "Support vexpress_ca15_tc2" - select CPU_V7A -@@ -1820,6 +1826,7 @@ source "board/Marvell/gplugd/Kconfig" + bool "Support vexpress_ca15_tc2" + select CPU_V7A +@@ -1866,6 +1872,7 @@ source "board/Marvell/gplugd/Kconfig" source "board/armadeus/apf27/Kconfig" source "board/armltd/vexpress/Kconfig" source "board/armltd/vexpress64/Kconfig" @@ -304,6 +304,6 @@ index 000000000000..6db5b1cf4ac2 +#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_IS_IN_FLASH 1 +#endif --- -2.26.2 +-- +2.28.0