diff --git a/config/sources/sunxi64_common.inc b/config/sources/sunxi64_common.inc index 7a8891a46e..a4a270581a 100644 --- a/config/sources/sunxi64_common.inc +++ b/config/sources/sunxi64_common.inc @@ -23,7 +23,7 @@ case $BRANCH in BOOTSOURCE=$MAINLINE_UBOOT_SOURCE BOOTDIR=$MAINLINE_UBOOT_DIR BOOTBRANCH=$MAINLINE_UBOOT_BRANCH - BOOTPATCHDIR='u-boot-sun50i-dev' + BOOTPATCHDIR='u-boot-sunxi' UBOOT_USE_GCC='> 7.0' UBOOT_TARGET_MAP=';;spl/sunxi-spl.bin u-boot.itb' BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd' @@ -45,7 +45,7 @@ case $BRANCH in BOOTSOURCE=$MAINLINE_UBOOT_SOURCE BOOTDIR=$MAINLINE_UBOOT_DIR BOOTBRANCH=$MAINLINE_UBOOT_BRANCH - BOOTPATCHDIR='u-boot-sun50i-dev' + BOOTPATCHDIR='u-boot-sunxi' UBOOT_USE_GCC='> 7.0' UBOOT_TARGET_MAP=';;spl/sunxi-spl.bin u-boot.itb' BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd' diff --git a/patch/u-boot/u-boot-sun50i-dev/add-missing-gpio-compatibles.patch b/patch/u-boot/u-boot-sun50i-dev/add-missing-gpio-compatibles.patch deleted file mode 100644 index a1da061afe..0000000000 --- a/patch/u-boot/u-boot-sun50i-dev/add-missing-gpio-compatibles.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 15f9f20862e5d75aa0e0ef5bfacddc00a7494b67 Mon Sep 17 00:00:00 2001 -From: Andre Przywara -Date: Thu, 29 Jun 2017 09:42:58 +0100 -Subject: [PATCH] sunxi: gpio: add missing compatible strings - -The sunxi GPIO driver is missing some compatible strings for recent -SoCs. While most of the sunxi GPIO code seems to not rely on this (and -so works anyway), the sunxi_name_to_gpio() function does and fails at -the moment (for instance when resolving the MMC CD pin name). -Add the compatible strings for the A64, H5 and V3s, which were missing -from the list. This now covers all pinctrl nodes in our own DTs. -Strictly speaking the V3s has only ports B, C, E, F and G, but I think -the other SoCs have gaps in there as well and for the pin number -computation this does not matter. - -Signed-off-by: Andre Przywara ---- - drivers/gpio/sunxi_gpio.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c -index b47cc66c58..d20a7e75d1 100644 ---- a/drivers/gpio/sunxi_gpio.c -+++ b/drivers/gpio/sunxi_gpio.c -@@ -353,12 +353,16 @@ static const struct udevice_id sunxi_gpio_ids[] = { - ID("allwinner,sun8i-a83t-pinctrl", a_all), - ID("allwinner,sun8i-h3-pinctrl", a_all), - ID("allwinner,sun8i-r40-pinctrl", a_all), -+ ID("allwinner,sun8i-v3s-pinctrl", a_all), - ID("allwinner,sun9i-a80-pinctrl", a_all), -+ ID("allwinner,sun50i-a64-pinctrl", a_all), -+ ID("allwinner,sun50i-h5-pinctrl", a_all), - ID("allwinner,sun6i-a31-r-pinctrl", l_2), - ID("allwinner,sun8i-a23-r-pinctrl", l_1), - ID("allwinner,sun8i-a83t-r-pinctrl", l_1), - ID("allwinner,sun8i-h3-r-pinctrl", l_1), - ID("allwinner,sun9i-a80-r-pinctrl", l_3), -+ ID("allwinner,sun50i-a64-r-pinctrl", l_1), - { } - }; - diff --git a/patch/u-boot/u-boot-sun50i-dev/disable-usb-keyboards.patch b/patch/u-boot/u-boot-sun50i-dev/disable-usb-keyboards.patch deleted file mode 100644 index d70d7e517e..0000000000 --- a/patch/u-boot/u-boot-sun50i-dev/disable-usb-keyboards.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 0ed36cded..0882209ef 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -581,7 +581,6 @@ config ARCH_SUNXI - select DM - select DM_ETH - select DM_GPIO -- select DM_KEYBOARD - select DM_SERIAL - select DM_USB if DISTRO_DEFAULTS - select OF_BOARD_SETUP -@@ -592,7 +591,6 @@ config ARCH_SUNXI - select SYS_NS16550 - select USB if DISTRO_DEFAULTS - select USB_STORAGE if DISTRO_DEFAULTS -- select USB_KEYBOARD if DISTRO_DEFAULTS - select USE_TINY_PRINTF - - config TARGET_TS4600 diff --git a/patch/u-boot/u-boot-sun50i-dev/enable-DT-overlays-support.patch b/patch/u-boot/u-boot-sun50i-dev/enable-DT-overlays-support.patch deleted file mode 100644 index e31df424cb..0000000000 --- a/patch/u-boot/u-boot-sun50i-dev/enable-DT-overlays-support.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 0ed36cded..822ebb812 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -578,6 +578,7 @@ config ARCH_SUNXI - select CMD_GPIO - select CMD_MMC if MMC - select CMD_USB if DISTRO_DEFAULTS -+ select OF_LIBFDT_OVERLAY - select DM - select DM_ETH - select DM_GPIO diff --git a/patch/u-boot/u-boot-sun50i-dev/pll1-clock-fix-h5.patch b/patch/u-boot/u-boot-sun50i-dev/pll1-clock-fix-h5.patch deleted file mode 100644 index bd3c3a883b..0000000000 --- a/patch/u-boot/u-boot-sun50i-dev/pll1-clock-fix-h5.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit ccfb6e16cb998c5885e5dce969b7a8675a570aa8 -Author: ehoutsma -Date: Wed Jan 18 11:31:08 2017 +0100 - - Never use m divider - -diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c -index a70c9cd..f814ba4 100644 ---- a/arch/arm/mach-sunxi/clock_sun6i.c -+++ b/arch/arm/mach-sunxi/clock_sun6i.c -@@ -98,11 +98,10 @@ void clock_set_pll1(unsigned int clk) - int k = 1; - int m = 1; - -- if (clk > 1152000000) { -- k = 2; -- } else if (clk > 768000000) { -+ if (clk > 1368000000) { - k = 3; -- m = 2; -+ } else if (clk > 768000000) { -+ k = 2; - } - - /* Switch to 24MHz clock while changing PLL1 */ diff --git a/patch/u-boot/u-boot-sun50i-dev/sunxi-boot-splash.patch b/patch/u-boot/u-boot-sun50i-dev/sunxi-boot-splash.patch deleted file mode 100644 index 9cfa24dea2..0000000000 --- a/patch/u-boot/u-boot-sun50i-dev/sunxi-boot-splash.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index 3a360ca4..0423c08 ---- a/include/config_distro_bootcmd.h -+++ b/include/config_distro_bootcmd.h -@@ -327,6 +327,9 @@ - BOOTENV_SHARED_UBIFS \ - BOOTENV_SHARED_EFI \ - "boot_prefixes=/ /boot/\0" \ -+ "splashpos=m,m\0" \ -+ "splashimage=66000000\0" \ -+ "loadsplash=if load mmc 0 ${splashimage} /boot/boot.bmp || load mmc 0 ${splashimage} boot.bmp; then bmp d ${splashimage}; fi\0" \ - "boot_scripts=boot.scr.uimg boot.scr\0" \ - "boot_script_dhcp=boot.scr.uimg\0" \ - BOOTENV_BOOT_TARGETS \ -@@ -390,7 +393,7 @@ - "done\0" - - #ifndef CONFIG_BOOTCOMMAND --#define CONFIG_BOOTCOMMAND "run distro_bootcmd" -+#define CONFIG_BOOTCOMMAND "run loadsplash; run distro_bootcmd" - #endif - - #endif /* _CONFIG_CMD_DISTRO_BOOTCMD_H */ -diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h -index 2d6b815..33a7b86 ---- a/include/configs/sunxi-common.h -+++ b/include/configs/sunxi-common.h -@@ -10,6 +10,12 @@ - * SPDX-License-Identifier: GPL-2.0+ - */ - -+#ifdef CONFIG_VIDEO -+#define CONFIG_SPLASH_SCREEN -+#define CONFIG_SPLASH_SCREEN_ALIGN -+#define CONFIG_CMD_BMP -+#define CONFIG_VIDEO_BMP_RLE8 -+#endif - #ifndef _SUNXI_COMMON_CONFIG_H - #define _SUNXI_COMMON_CONFIG_H - diff --git a/patch/u-boot/u-boot-sun50i-dev/add-nanopineoplus2.patch b/patch/u-boot/u-boot-sunxi/add-nanopineoplus2.patch similarity index 100% rename from patch/u-boot/u-boot-sun50i-dev/add-nanopineoplus2.patch rename to patch/u-boot/u-boot-sunxi/add-nanopineoplus2.patch diff --git a/patch/u-boot/u-boot-sun50i-dev/add-pinebook-defconfig.patch b/patch/u-boot/u-boot-sunxi/add-pinebook-defconfig.patch similarity index 100% rename from patch/u-boot/u-boot-sun50i-dev/add-pinebook-defconfig.patch rename to patch/u-boot/u-boot-sunxi/add-pinebook-defconfig.patch diff --git a/patch/u-boot/u-boot-sun50i-dev/fix-sopine-defconfig.patch b/patch/u-boot/u-boot-sunxi/fix-sopine-defconfig.patch similarity index 100% rename from patch/u-boot/u-boot-sun50i-dev/fix-sopine-defconfig.patch rename to patch/u-boot/u-boot-sunxi/fix-sopine-defconfig.patch