diff --git a/rebuild.sh b/rebuild.sh index 5afe659..69034b0 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -28,7 +28,7 @@ NAME="rebuild-${VERSION}-${TAG}" cd $BUILD_DIR git reset --hard git pull -git checkout v23.08 +git checkout main rm -rf "userpatches" cd "$ROOT_DIR" diff --git a/userpatches/u-boot/u-boot-sunxi/allwinner-add-support-for-Recore.patch b/userpatches/u-boot/u-boot-sunxi/allwinner-add-support-for-Recore.patch index efedc29..178fe93 100644 --- a/userpatches/u-boot/u-boot-sunxi/allwinner-add-support-for-Recore.patch +++ b/userpatches/u-boot/u-boot-sunxi/allwinner-add-support-for-Recore.patch @@ -28,7 +28,7 @@ new file mode 100644 index 0000000000..2d29fe1556 --- /dev/null +++ b/arch/arm/dts/sun50i-a64-recore.dts -@@ -0,0 +1,271 @@ +@@ -0,0 +1,269 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// Copyright (c) 2016 ARM Ltd. + @@ -286,8 +286,8 @@ index 0000000000..2d29fe1556 +}; + +&usb_otg { -+ dr_mode = "peripheral"; -+ vcc-supply = <®_dcdc1>; ++ dr_mode = "peripheral"; ++ vcc-supply = <®_dcdc1>; + status = "okay"; +}; + @@ -296,8 +296,6 @@ index 0000000000..2d29fe1556 +}; + +&usbphy { -+ usb0_vbus_power-supply = <&usb_power_supply>; -+ vcc-supply = <®_dcdc1>; + status = "okay"; +}; diff --git a/configs/recore_defconfig b/configs/recore_defconfig @@ -305,7 +303,7 @@ new file mode 100644 index 0000000000..6ed99805ab --- /dev/null +++ b/configs/recore_defconfig -@@ -0,0 +1,32 @@ +@@ -0,0 +1,23 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_SPL=y @@ -315,28 +313,19 @@ index 0000000000..6ed99805ab +CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y +CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-recore" +CONFIG_OF_LIST="sun50i-a64-recore" -+CONFIG_DM_VIDEO=y +CONFIG_PHY_REALTEK=y +CONFIG_SUN8I_EMAC=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y +CONFIG_ENV_IS_NOWHERE=y -+#CONFIG_ENV_IS_IN_MMC=y +CONFIG_SPL_STACK=0x54000 +CONFIG_SYS_PBSIZE=1024 +CONFIG_SYS_BOOTM_LEN=0x2000000 +CONFIG_SUPPORT_EMMC_BOOT=y -+CONFIG_LED=y -+CONFIG_LED_GPIO=y -+CONFIG_SPLASH_SCREEN_ALIGN=y -+CONFIG_VIDEO_LOGO=y -+CONFIG_SPLASH_SCREEN=y -+CONFIG_BMP_16BPP=y -+CONFIG_BMP_24BPP=y -+CONFIG_BMP_32BPP=y -+CONFIG_VIDEO_BMP_RLE8=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_CMD_REGULATOR=y ++CONFIG_USE_PREBOOT=y ++CONFIG_PREBOOT="regulator status" -- 2.30.2 diff --git a/userpatches/u-boot/u-boot-sunxi/allwinner-boot-splash.patch b/userpatches/u-boot/u-boot-sunxi/allwinner-boot-splash.patch deleted file mode 100644 index 49e8489..0000000 --- a/userpatches/u-boot/u-boot-sunxi/allwinner-boot-splash.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 5ac0039607be388a35df2dd4729fcc9d03b84b21 Mon Sep 17 00:00:00 2001 -From: The Going <48602507+The-going@users.noreply.github.com> -Date: Fri, 1 Apr 2022 22:57:09 +0300 -Subject: [PATCH] sunxi boot splash - ---- - cmd/Kconfig | 1 + - include/config_distro_bootcmd.h | 9 +++++++++ - include/configs/sunxi-common.h | 16 ++++++++++++++++ - 3 files changed, 26 insertions(+) - -diff --git a/cmd/Kconfig b/cmd/Kconfig -index 3a857b3f..492476e5 100644 ---- a/cmd/Kconfig -+++ b/cmd/Kconfig -@@ -1662,6 +1662,7 @@ menu "Misc commands" - config CMD_BMP - bool "Enable 'bmp' command" - depends on VIDEO -+ default y - help - This provides a way to obtain information about a BMP-format image - and to display it. BMP (which presumably stands for BitMaP) is a -diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index 750e9e04..9e70ddb3 100644 ---- a/include/config_distro_bootcmd.h -+++ b/include/config_distro_bootcmd.h -@@ -430,6 +430,15 @@ - BOOTENV_SHARED_EFI \ - BOOTENV_SHARED_VIRTIO \ - "boot_prefixes=/ /boot/\0" \ -+ "splashpos=m,m\0" \ -+ "splashimage=66000000\0" \ -+ "loadsplash= " \ -+ "for prefix in ${boot_prefixes}; do " \ -+ "if test -e mmc 1 ${prefix}boot.bmp; then " \ -+ "load mmc 1 ${splashimage} ${prefix}boot.bmp; " \ -+ "bmp d ${splashimage}; " \ -+ "fi; " \ -+ "done\0" \ - "boot_scripts=boot.scr.uimg boot.scr\0" \ - "boot_script_dhcp=boot.scr.uimg\0" \ - BOOTENV_BOOT_TARGETS \ -diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h -index 958b850d..c4f34dbf 100644 ---- a/include/configs/sunxi-common.h -+++ b/include/configs/sunxi-common.h -@@ -223,6 +223,30 @@ extern int soft_i2c_gpio_scl; - #define CONFIG_VIDEO_LCD_I2C_BUS -1 /* NA, but necessary to compile */ - #endif - -+#if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO -+#if !defined CONFIG_VIDEO_LOGO -+#define CONFIG_VIDEO_LOGO -+#endif -+#if !defined CONFIG_SPLASH_SCREEN -+#define CONFIG_SPLASH_SCREEN -+#endif -+#if !defined CONFIG_SPLASH_SCREEN_ALIGN -+#define CONFIG_SPLASH_SCREEN_ALIGN -+#endif -+#if !defined CONFIG_BMP_16BPP -+#define CONFIG_BMP_16BPP -+#endif -+#if !defined CONFIG_BMP_24BPP -+#define CONFIG_BMP_24BPP -+#endif -+#if !defined CONFIG_BMP_32BPP -+#define CONFIG_BMP_32BPP -+#endif -+#if !defined CONFIG_VIDEO_BMP_RLE8 -+#define CONFIG_VIDEO_BMP_RLE8 -+#endif -+#endif -+ - /* Ethernet support */ - - #ifdef CONFIG_USB_EHCI_HCD -@@ -394,8 +404,14 @@ extern int soft_i2c_gpio_scl; - #include - - #ifdef CONFIG_USB_KEYBOARD -+#if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO -+#define CONSOLE_STDIN_SETTINGS \ -+ "preboot=regulator status\0" \ -+ "stdin=serial\0" -+#else - #define CONSOLE_STDIN_SETTINGS \ - "stdin=serial,usbkbd\0" -+#endif - #else - #define CONSOLE_STDIN_SETTINGS \ - "stdin=serial\0" --- -2.34.1 - -