From 192281ae3038a57d98c8e0a06bcab0bd8efa2fc7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 25 Dec 2022 21:10:39 +0100 Subject: implement dual-boot for rockpi4-plus device --- package/u-boot/files/fw_env.config | 2 +- .../patch-configs_bananapi_m2_p2_zero_defconfig | 18 ++++++++++++++++++ .../patches/patch-configs_rock-pi-4-rk3399_defconfig | 14 ++------------ 3 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 package/u-boot/patches/patch-configs_bananapi_m2_p2_zero_defconfig (limited to 'package/u-boot') diff --git a/package/u-boot/files/fw_env.config b/package/u-boot/files/fw_env.config index 7b798416e..8fd738b4e 100644 --- a/package/u-boot/files/fw_env.config +++ b/package/u-boot/files/fw_env.config @@ -1 +1 @@ -/dev/mmcblk0 -0x20000 0x20000 +/dev/mmcblk1 0x3F8000 0x8000 diff --git a/package/u-boot/patches/patch-configs_bananapi_m2_p2_zero_defconfig b/package/u-boot/patches/patch-configs_bananapi_m2_p2_zero_defconfig new file mode 100644 index 000000000..c9761d409 --- /dev/null +++ b/package/u-boot/patches/patch-configs_bananapi_m2_p2_zero_defconfig @@ -0,0 +1,18 @@ +--- u-boot-2022.10.orig/configs/bananapi_m2_p2_zero_defconfig 1970-01-01 00:00:00.000000000 +0100 ++++ u-boot-2022.10/configs/bananapi_m2_p2_zero_defconfig 2022-12-25 07:59:45.852731211 +0100 +@@ -0,0 +1,15 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++# CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-bananapi-m2-plus-v1.2" ++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-bananapi-m2-zero" ++CONFIG_SPL=y ++CONFIG_MACH_SUN8I_H3=y ++CONFIG_DRAM_CLK=408 ++CONFIG_MMC0_CD_PIN="" ++CONFIG_MMC_SUNXI_SLOT_EXTRA=2 ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_PREBOOT="" ++# CONFIG_SYS_DEVICE_NULLDEV is not set ++CONFIG_SPL_STACK=0x8000 ++CONFIG_SYS_PBSIZE=1024 ++CONFIG_SUN8I_EMAC=y diff --git a/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig b/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig index 575ddfbe6..93307dc60 100644 --- a/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig +++ b/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig @@ -1,16 +1,6 @@ --- u-boot-2022.10.orig/configs/rock-pi-4-rk3399_defconfig 2022-10-03 21:25:32.000000000 +0200 -+++ u-boot-2022.10/configs/rock-pi-4-rk3399_defconfig 2022-12-25 06:25:34.169217143 +0100 -@@ -4,7 +4,8 @@ CONFIG_COUNTER_FREQUENCY=24000000 - CONFIG_ARCH_ROCKCHIP=y - CONFIG_SYS_TEXT_BASE=0x00200000 - CONFIG_NR_DRAM_BANKS=1 --CONFIG_ENV_OFFSET=0x3F8000 -+CONFIG_ENV_OFFSET=-0x20000 -+CONFIG_ENV_SIZE=0x20000 - CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4b" - CONFIG_ROCKCHIP_RK3399=y - CONFIG_TARGET_EVB_RK3399=y -@@ -60,7 +61,7 @@ CONFIG_REGULATOR_RK8XX=y ++++ u-boot-2022.10/configs/rock-pi-4-rk3399_defconfig 2022-12-25 08:01:46.267056624 +0100 +@@ -60,7 +62,7 @@ CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM_RK3399_LPDDR4=y CONFIG_DM_RESET=y -- cgit v1.2.3