From f87032c302da895fbc1742a22249d010ee7a498e Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 13 Dec 2019 15:48:22 +0100 Subject: [PATCH] Some cleanups (#511) --- .../board/orangepi/kernel.config | 31 +++++++++- .../board/orangepi/patches/README.md | 5 -- ...ixup_ethernet-again-to-set-macaddr-f.patch | 41 ------------ .../uboot/4kfix-limit-screen-to-full-hd.patch | 19 ------ .../adjust-default-dram-clockspeeds.patch | 13 ---- .../uboot/do-not-relocate-initrd.patch | 27 -------- .../uboot/enable-DT-overlays-support.patch | 13 ---- .../enable-r_pio-gpio-access-h3-h5.patch | 24 ------- .../fdt-setprop-fix-unaligned-access.patch | 23 ------- ...Fix-PLL1-setup-to-never-use-dividers.patch | 32 ---------- .../patches/uboot/h3-enable-power-led.patch | 16 ----- .../h3-set-safe-axi_apb-clock-dividers.patch | 42 ------------- ...er-default-DRAM-freq-A64-H5.patch.disabled | 13 ---- .../patches/uboot/sun8i-set-machid.patch | 11 ---- .../patches/uboot/sunxi-boot-splash.patch | 62 ------------------- .../configs/opi_prime_defconfig | 4 +- 16 files changed, 32 insertions(+), 344 deletions(-) delete mode 100644 buildroot-external/board/orangepi/patches/README.md delete mode 100644 buildroot-external/board/orangepi/patches/uboot/0020-sunxi-call-fdt_fixup_ethernet-again-to-set-macaddr-f.patch delete mode 100644 buildroot-external/board/orangepi/patches/uboot/4kfix-limit-screen-to-full-hd.patch delete mode 100644 buildroot-external/board/orangepi/patches/uboot/adjust-default-dram-clockspeeds.patch delete mode 100644 buildroot-external/board/orangepi/patches/uboot/do-not-relocate-initrd.patch delete mode 100644 buildroot-external/board/orangepi/patches/uboot/enable-DT-overlays-support.patch delete mode 100644 buildroot-external/board/orangepi/patches/uboot/enable-r_pio-gpio-access-h3-h5.patch delete mode 100644 buildroot-external/board/orangepi/patches/uboot/fdt-setprop-fix-unaligned-access.patch delete mode 100644 buildroot-external/board/orangepi/patches/uboot/h3-Fix-PLL1-setup-to-never-use-dividers.patch delete mode 100644 buildroot-external/board/orangepi/patches/uboot/h3-enable-power-led.patch delete mode 100644 buildroot-external/board/orangepi/patches/uboot/h3-set-safe-axi_apb-clock-dividers.patch delete mode 100644 buildroot-external/board/orangepi/patches/uboot/lower-default-DRAM-freq-A64-H5.patch.disabled delete mode 100644 buildroot-external/board/orangepi/patches/uboot/sun8i-set-machid.patch delete mode 100644 buildroot-external/board/orangepi/patches/uboot/sunxi-boot-splash.patch diff --git a/buildroot-external/board/orangepi/kernel.config b/buildroot-external/board/orangepi/kernel.config index 570e83546..1953bca8c 100644 --- a/buildroot-external/board/orangepi/kernel.config +++ b/buildroot-external/board/orangepi/kernel.config @@ -1,3 +1,32 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y - +# CONFIG_ARCH_ACTIONS is not set +# CONFIG_ARCH_ALPINE is not set +# CONFIG_ARCH_BCM2835 is not set +# CONFIG_ARCH_BCM_IPROC is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_BRCMSTB is not set +# CONFIG_ARCH_EXYNOS is not set +# CONFIG_ARCH_K3 is not set +# CONFIG_ARCH_LAYERSCAPE is not set +# CONFIG_ARCH_LG1K is not set +# CONFIG_ARCH_HISI is not set +# CONFIG_ARCH_MEDIATEK is not set +# CONFIG_ARCH_MESON is not set +# CONFIG_ARCH_MVEBU is not set +# CONFIG_ARCH_QCOM is not set +# CONFIG_ARCH_REALTEK is not set +# CONFIG_ARCH_ROCKCHIP is not set +# CONFIG_ARCH_SEATTLE is not set +# CONFIG_ARCH_SYNQUACER is not set +# CONFIG_ARCH_RENESAS is not set +# CONFIG_ARCH_STRATIX10 is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_SPRD is not set +# CONFIG_ARCH_THUNDER is not set +# CONFIG_ARCH_THUNDER2 is not set +# CONFIG_ARCH_UNIPHIER is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_XGENE is not set +# CONFIG_ARCH_ZX is not set +# CONFIG_ARCH_ZYNQMP is not set diff --git a/buildroot-external/board/orangepi/patches/README.md b/buildroot-external/board/orangepi/patches/README.md deleted file mode 100644 index 7b1911b5f..000000000 --- a/buildroot-external/board/orangepi/patches/README.md +++ /dev/null @@ -1,5 +0,0 @@ -## Kernel -https://github.com/armbian/build/tree/master/patch/kernel/sunxi-next - -## u-boot -https://github.com/armbian/build/tree/master/patch/u-boot/u-boot-sunxi diff --git a/buildroot-external/board/orangepi/patches/uboot/0020-sunxi-call-fdt_fixup_ethernet-again-to-set-macaddr-f.patch b/buildroot-external/board/orangepi/patches/uboot/0020-sunxi-call-fdt_fixup_ethernet-again-to-set-macaddr-f.patch deleted file mode 100644 index 45dc3ae32..000000000 --- a/buildroot-external/board/orangepi/patches/uboot/0020-sunxi-call-fdt_fixup_ethernet-again-to-set-macaddr-f.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 55d3cc28b37000d1a3d7224c0ba4a808274e0b33 Mon Sep 17 00:00:00 2001 -From: Icenowy Zheng -Date: Fri, 27 Oct 2017 17:25:00 +0800 -Subject: [PATCH 20/20] sunxi: call fdt_fixup_ethernet again to set macaddr for - more aliases - -Sometimes some ethernet aliases do not exist in U-Boot FDT but they -exist in the FDT used to boot the system. In this situation -setup_environment is called again in ft_board_setup to generate macaddr -environment variable for them. However now the call to -fdt_fixup_ethernet is moved before the call of ft_board_setup. - -Call fdt_fixup_ethernet again to add MAC addresses for the extra -ethernet aliases. - -Signed-off-by: Icenowy Zheng ---- - board/sunxi/board.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/board/sunxi/board.c b/board/sunxi/board.c -index 192cf8ca45..0fe70f47cb 100644 ---- a/board/sunxi/board.c -+++ b/board/sunxi/board.c -@@ -751,10 +751,12 @@ int ft_board_setup(void *blob, bd_t *bd) - int __maybe_unused r; - - /* -- * Call setup_environment again in case the boot fdt has -- * ethernet aliases the u-boot copy does not have. -+ * Call setup_environment and fdt_fixup_ethernet again -+ * in case the boot fdt has ethernet aliases the u-boot -+ * copy does not have. - */ - setup_environment(blob); -+ fdt_fixup_ethernet(blob); - - #ifdef CONFIG_VIDEO_DT_SIMPLEFB - r = sunxi_simplefb_setup(blob); --- -2.13.6 diff --git a/buildroot-external/board/orangepi/patches/uboot/4kfix-limit-screen-to-full-hd.patch b/buildroot-external/board/orangepi/patches/uboot/4kfix-limit-screen-to-full-hd.patch deleted file mode 100644 index 7abe749fc..000000000 --- a/buildroot-external/board/orangepi/patches/uboot/4kfix-limit-screen-to-full-hd.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c -index 92c9d06054..cd16d69e30 100644 ---- a/drivers/video/sunxi/sunxi_display.c -+++ b/drivers/video/sunxi/sunxi_display.c -@@ -1274,8 +1274,12 @@ void *video_hw_init(void) - ret = sunxi_hdmi_hpd_detect(hpd_delay); - if (ret) { - printf("HDMI connected: "); -- if (edid && sunxi_hdmi_edid_get_mode(&custom) == 0) -- mode = &custom; -+ if (edid && sunxi_hdmi_edid_get_mode(&custom) == 0) { -+ if ((custom.xres <= 1920) && (custom.yres <= 1080)) -+ mode = &custom; -+ else -+ mode = &res_mode_init[RES_MODE_1920x1080]; -+ } - } else if (hpd) { - sunxi_hdmi_shutdown(); - sunxi_display.monitor = sunxi_get_default_mon(false); diff --git a/buildroot-external/board/orangepi/patches/uboot/adjust-default-dram-clockspeeds.patch b/buildroot-external/board/orangepi/patches/uboot/adjust-default-dram-clockspeeds.patch deleted file mode 100644 index 5156fd2d6..000000000 --- a/buildroot-external/board/orangepi/patches/uboot/adjust-default-dram-clockspeeds.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig -index 103936d772..990cf2a8c0 100644 ---- a/configs/orangepi_prime_defconfig -+++ b/configs/orangepi_prime_defconfig -@@ -1,7 +1,7 @@ - CONFIG_ARM=y - CONFIG_ARCH_SUNXI=y - CONFIG_MACH_SUN50I_H5=y --CONFIG_DRAM_CLK=672 -+CONFIG_DRAM_CLK=624 - CONFIG_DRAM_ZQ=3881977 - CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-prime" - # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set diff --git a/buildroot-external/board/orangepi/patches/uboot/do-not-relocate-initrd.patch b/buildroot-external/board/orangepi/patches/uboot/do-not-relocate-initrd.patch deleted file mode 100644 index f5020ded0..000000000 --- a/buildroot-external/board/orangepi/patches/uboot/do-not-relocate-initrd.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h -index 64a190059a..bbec551cac 100644 ---- a/include/configs/sunxi-common.h -+++ b/include/configs/sunxi-common.h -@@ -503,6 +503,12 @@ extern int soft_i2c_gpio_scl; - #define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb" - #endif - -+#ifdef CONFIG_MACH_SUN8I_H3 -+#define INITRD_HIGH_ENV "initrd_high=0xFFFFFFFF\0" -+#else -+#define INITRD_HIGH_ENV -+#endif -+ - #define CONFIG_EXTRA_ENV_SETTINGS \ - CONSOLE_ENV_SETTINGS \ - MEM_LAYOUT_ENV_SETTINGS \ -@@ -512,7 +518,8 @@ extern int soft_i2c_gpio_scl; - SUNXI_MTDIDS_DEFAULT \ - SUNXI_MTDPARTS_DEFAULT \ - BOOTCMD_SUNXI_COMPAT \ -- BOOTENV -+ BOOTENV \ -+ INITRD_HIGH_ENV - - #else /* ifndef CONFIG_SPL_BUILD */ - #define CONFIG_EXTRA_ENV_SETTINGS diff --git a/buildroot-external/board/orangepi/patches/uboot/enable-DT-overlays-support.patch b/buildroot-external/board/orangepi/patches/uboot/enable-DT-overlays-support.patch deleted file mode 100644 index fd5ed2039..000000000 --- a/buildroot-external/board/orangepi/patches/uboot/enable-DT-overlays-support.patch +++ /dev/null @@ -1,13 +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,8 @@ config ARCH_SUNXI - select CMD_GPIO - select CMD_MMC if MMC - select CMD_USB if DISTRO_DEFAULTS -+ select OF_LIBFDT -+ select OF_LIBFDT_OVERLAY - select DM - select DM_ETH - select DM_GPIO diff --git a/buildroot-external/board/orangepi/patches/uboot/enable-r_pio-gpio-access-h3-h5.patch b/buildroot-external/board/orangepi/patches/uboot/enable-r_pio-gpio-access-h3-h5.patch deleted file mode 100644 index 1ff273de7..000000000 --- a/buildroot-external/board/orangepi/patches/uboot/enable-r_pio-gpio-access-h3-h5.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c -index 7ac8360..0484e7a 100644 ---- a/arch/arm/mach-sunxi/board.c -+++ b/arch/arm/mach-sunxi/board.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include - -@@ -65,6 +66,11 @@ struct mm_region *mem_map = sunxi_mem_map; - - static int gpio_init(void) - { -+#if defined(CONFIG_MACH_SUNXI_H3_H5) -+ /* enable R_PIO GPIO access */ -+ prcm_apb0_enable(PRCM_APB0_GATE_PIO); -+#endif -+ - #if CONFIG_CONS_INDEX == 1 && defined(CONFIG_UART0_PORT_F) - #if defined(CONFIG_MACH_SUN4I) || \ - defined(CONFIG_MACH_SUN7I) || \ diff --git a/buildroot-external/board/orangepi/patches/uboot/fdt-setprop-fix-unaligned-access.patch b/buildroot-external/board/orangepi/patches/uboot/fdt-setprop-fix-unaligned-access.patch deleted file mode 100644 index 882ceaa08..000000000 --- a/buildroot-external/board/orangepi/patches/uboot/fdt-setprop-fix-unaligned-access.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/cmd/fdt.c b/cmd/fdt.c -index d7654b2c4f..a71b7713a8 100644 ---- a/cmd/fdt.c -+++ b/cmd/fdt.c -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - #define MAX_LEVEL 32 /* how deeply nested we will go */ - #define SCRATCHPAD 1024 /* bytes of scratchpad memory */ -@@ -781,7 +782,10 @@ static int fdt_parse_prop(char * const *newval, int count, char *data, int *len) - cp = newp; - tmp = simple_strtoul(cp, &newp, 0); - if (*cp != '?') -- *(fdt32_t *)data = cpu_to_fdt32(tmp); -+ { -+ tmp = cpu_to_fdt32(tmp); -+ put_unaligned(tmp, (fdt32_t *)data); -+ } - else - newp++; diff --git a/buildroot-external/board/orangepi/patches/uboot/h3-Fix-PLL1-setup-to-never-use-dividers.patch b/buildroot-external/board/orangepi/patches/uboot/h3-Fix-PLL1-setup-to-never-use-dividers.patch deleted file mode 100644 index f8163ffd3..000000000 --- a/buildroot-external/board/orangepi/patches/uboot/h3-Fix-PLL1-setup-to-never-use-dividers.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7f5071f906f79bdc99d6b4b0ccf0cb280abe740b Mon Sep 17 00:00:00 2001 -From: Ondrej Jirman -Date: Tue, 20 Dec 2016 11:25:12 +0100 -Subject: [PATCH] sunxi: h3: Fix PLL1 setup to never use dividers - -Kernel would lower the divider on first CLK change and cause the -lock up. ---- - arch/arm/mach-sunxi/clock_sun6i.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c -index 50fb302a19..91aa2a0478 100644 ---- a/arch/arm/mach-sunxi/clock_sun6i.c -+++ b/arch/arm/mach-sunxi/clock_sun6i.c -@@ -94,11 +94,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 */ --- -2.11.0 diff --git a/buildroot-external/board/orangepi/patches/uboot/h3-enable-power-led.patch b/buildroot-external/board/orangepi/patches/uboot/h3-enable-power-led.patch deleted file mode 100644 index 1082db0ba..000000000 --- a/buildroot-external/board/orangepi/patches/uboot/h3-enable-power-led.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/board/sunxi/board.c b/board/sunxi/board.c -index 3cf3614..89cf7f5 100644 ---- a/board/sunxi/board.c -+++ b/board/sunxi/board.c -@@ -478,6 +478,11 @@ void sunxi_board_init(void) - int power_failed = 0; - unsigned long ramsize; - -+#ifdef CONFIG_MACH_SUN8I_H3 -+ /* turn on power LED (PL10) on H3 boards */ -+ gpio_direction_output(SUNXI_GPL(10), 1); -+#endif -+ - #ifdef CONFIG_SY8106A_POWER - power_failed = sy8106a_set_vout1(CONFIG_SY8106A_VOUT1_VOLT); - #endif diff --git a/buildroot-external/board/orangepi/patches/uboot/h3-set-safe-axi_apb-clock-dividers.patch b/buildroot-external/board/orangepi/patches/uboot/h3-set-safe-axi_apb-clock-dividers.patch deleted file mode 100644 index a59c4b178..000000000 --- a/buildroot-external/board/orangepi/patches/uboot/h3-set-safe-axi_apb-clock-dividers.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c -index 15272c9..cedddc2 100644 ---- a/arch/arm/mach-sunxi/clock_sun6i.c -+++ b/arch/arm/mach-sunxi/clock_sun6i.c -@@ -117,8 +117,8 @@ void clock_set_pll1(unsigned int clk) - sdelay(200); - - /* Switch CPU to PLL1 */ -- writel(AXI_DIV_3 << AXI_DIV_SHIFT | -- ATB_DIV_2 << ATB_DIV_SHIFT | -+ writel(AXI_DIV_4 << AXI_DIV_SHIFT | -+ ATB_DIV_4 << ATB_DIV_SHIFT | - CPU_CLK_SRC_PLL1 << CPU_CLK_SRC_SHIFT, - &ccm->cpu_axi_cfg); - } -diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h -index f2990db..b3a8575 100644 ---- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h -+++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h -@@ -180,6 +180,7 @@ struct sunxi_ccm_reg { - #define CCM_PLL1_CTRL_N(n) ((((n) - 1) & 0x1f) << 8) - #define CCM_PLL1_CTRL_P(n) (((n) & 0x3) << 16) - #define CCM_PLL1_CTRL_EN (0x1 << 31) -+#define CCM_PLL1_CTRL_LOCK (0x1 << 28) - - #define CCM_PLL3_CTRL_M_SHIFT 0 - #define CCM_PLL3_CTRL_M_MASK (0xf << CCM_PLL3_CTRL_M_SHIFT) -diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c -index cedddc2..3fe9305 100644 ---- a/arch/arm/mach-sunxi/clock_sun6i.c -+++ b/arch/arm/mach-sunxi/clock_sun6i.c -@@ -114,7 +114,9 @@ void clock_set_pll1(unsigned int clk) - writel(CCM_PLL1_CTRL_EN | CCM_PLL1_CTRL_P(p) | - CCM_PLL1_CTRL_N(clk / (24000000 * k / m)) | - CCM_PLL1_CTRL_K(k) | CCM_PLL1_CTRL_M(m), &ccm->pll1_cfg); -- sdelay(200); -+ -+ while (!(readl(&ccm->pll1_cfg) & CCM_PLL1_CTRL_LOCK)) -+ ; - - /* Switch CPU to PLL1 */ - writel(AXI_DIV_4 << AXI_DIV_SHIFT | diff --git a/buildroot-external/board/orangepi/patches/uboot/lower-default-DRAM-freq-A64-H5.patch.disabled b/buildroot-external/board/orangepi/patches/uboot/lower-default-DRAM-freq-A64-H5.patch.disabled deleted file mode 100644 index d94120f20..000000000 --- a/buildroot-external/board/orangepi/patches/uboot/lower-default-DRAM-freq-A64-H5.patch.disabled +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig -index 2309f59999..716e9c5e26 100644 ---- a/arch/arm/mach-sunxi/Kconfig -+++ b/arch/arm/mach-sunxi/Kconfig -@@ -278,7 +278,7 @@ config DRAM_CLK - default 312 if MACH_SUN6I || MACH_SUN8I - default 360 if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || \ - MACH_SUN8I_V3S -- default 672 if MACH_SUN50I -+ default 648 if MACH_SUN50I || MACH_SUN50I_H5 - ---help--- - Set the dram clock speed, valid range 240 - 480 (prior to sun9i), - must be a multiple of 24. For the sun9i (A80), the tested values diff --git a/buildroot-external/board/orangepi/patches/uboot/sun8i-set-machid.patch b/buildroot-external/board/orangepi/patches/uboot/sun8i-set-machid.patch deleted file mode 100644 index e11f4f600..000000000 --- a/buildroot-external/board/orangepi/patches/uboot/sun8i-set-machid.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h -index a4c3fb69e..47ce2e9e6 100644 ---- a/include/configs/sun8i.h -+++ b/include/configs/sun8i.h -@@ -30,4 +30,6 @@ - */ - #include - -+#define CONFIG_MACH_TYPE (0x1029) -+ - #endif /* __CONFIG_H */ diff --git a/buildroot-external/board/orangepi/patches/uboot/sunxi-boot-splash.patch b/buildroot-external/board/orangepi/patches/uboot/sunxi-boot-splash.patch deleted file mode 100644 index 8577d1912..000000000 --- a/buildroot-external/board/orangepi/patches/uboot/sunxi-boot-splash.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/cmd/Kconfig b/cmd/Kconfig -index d6d130edfa..92795119ea 100644 ---- a/cmd/Kconfig -+++ b/cmd/Kconfig -@@ -1029,6 +1029,7 @@ menu "Misc commands" - config CMD_BMP - bool "Enable 'bmp' command" - depends on LCD || DM_VIDEO || VIDEO -+ default y - help - This provides a way to obtain information about a BMP-format iamge - 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 9ed6b9892c..75d5176edf 100644 ---- a/include/config_distro_bootcmd.h -+++ b/include/config_distro_bootcmd.h -@@ -323,6 +323,15 @@ - BOOTENV_SHARED_UBIFS \ - BOOTENV_SHARED_EFI \ - "boot_prefixes=/ /boot/\0" \ -+ "splashpos=m,m\0" \ -+ "splashimage=66000000\0" \ -+ "loadsplash= " \ -+ "for prefix in ${boot_prefixes}; do " \ -+ "if test -e mmc 0 ${prefix}boot.bmp; then " \ -+ "load mmc 0 ${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 02d7be0849..cbdea20d08 100644 ---- a/include/configs/sunxi-common.h -+++ b/include/configs/sunxi-common.h -@@ -284,6 +284,16 @@ extern int soft_i2c_gpio_scl; - - #endif /* CONFIG_VIDEO */ - -+#if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO -+#define CONFIG_VIDEO_LOGO -+#define CONFIG_SPLASH_SCREEN -+#define CONFIG_SPLASH_SCREEN_ALIGN -+#define CONFIG_BMP_16BPP -+#define CONFIG_BMP_24BPP -+#define CONFIG_BMP_32BPP -+#define CONFIG_VIDEO_BMP_RLE8 -+#endif -+ - /* Ethernet support */ - #ifdef CONFIG_SUNXI_EMAC - #define CONFIG_PHY_ADDR 1 -@@ -444,7 +454,7 @@ extern int soft_i2c_gpio_scl; - - #ifdef CONFIG_USB_KEYBOARD - #define CONSOLE_STDIN_SETTINGS \ -- "preboot=usb start\0" \ -+ "preboot=run loadsplash; usb start\0" \ - "stdin=serial,usbkbd\0" - #else - #define CONSOLE_STDIN_SETTINGS \ diff --git a/buildroot-external/configs/opi_prime_defconfig b/buildroot-external/configs/opi_prime_defconfig index 72e41d87c..d71695277 100644 --- a/buildroot-external/configs/opi_prime_defconfig +++ b/buildroot-external/configs/opi_prime_defconfig @@ -4,7 +4,7 @@ BR2_ARM_FPU_VFPV4=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/patches" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -24,7 +24,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_prime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y