diff --git a/buildroot/board/allwinner-generic/sun8i-generic/scripts/post-build.sh b/buildroot/board/allwinner-generic/sun8i-generic/scripts/post-build.sh index a2520ad0..62173a89 100755 --- a/buildroot/board/allwinner-generic/sun8i-generic/scripts/post-build.sh +++ b/buildroot/board/allwinner-generic/sun8i-generic/scripts/post-build.sh @@ -12,4 +12,6 @@ cd $BINARIES_DIR echo "item=dtb, $5" >> boot_package.cfg $BINARIES_DIR/dragonsecboot -pack boot_package.cfg -mkbootimg --kernel zImage --ramdisk ramdisk.img --board sun8iw20p1 --base 0x40200000 --kernel_offset 0x0 --ramdisk_offset 0x01000000 -o boot.img \ No newline at end of file +$BINARIES_DIR/mkenvimage -r -p 0x00 -s 128k -o env.fex env.cfg + +mkbootimg --kernel zImage --ramdisk ramdisk.img --board sun8iw20p1 --base 0x40200000 --kernel_offset 0x0 --ramdisk_offset 0x01000000 -o boot.img diff --git a/buildroot/board/allwinner-generic/sunxi-generic/bin/mkenvimage b/buildroot/board/allwinner-generic/sunxi-generic/bin/mkenvimage new file mode 100755 index 00000000..6b4601d4 Binary files /dev/null and b/buildroot/board/allwinner-generic/sunxi-generic/bin/mkenvimage differ diff --git a/buildroot/board/mangopi/mq-dual/patch/uboot/0001-disable-uboot-dts-loc.patch b/buildroot/board/mangopi/mq-dual/patch/uboot/0001-disable-uboot-dts-loc.patch index 46f64d81..3c4e0066 100644 --- a/buildroot/board/mangopi/mq-dual/patch/uboot/0001-disable-uboot-dts-loc.patch +++ b/buildroot/board/mangopi/mq-dual/patch/uboot/0001-disable-uboot-dts-loc.patch @@ -1,25 +1,26 @@ -From 9299b8fa3d120a52f5468705c20ee7042693d0b9 Mon Sep 17 00:00:00 2001 +From 9f56f62b8f983f09288748ce7d21eef86260ee4a Mon Sep 17 00:00:00 2001 From: YuzukiTsuru -Date: Tue, 12 Apr 2022 10:12:26 +0800 -Subject: [PATCH 1/3] disable uboot dts loc +Date: Tue, 24 May 2022 10:32:23 +0800 +Subject: [PATCH] disable-uboot-dts-loc --- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 88c9e65..1216e1e 100644 +index 7c034d7..38073ae 100644 --- a/Makefile +++ b/Makefile -@@ -969,14 +969,14 @@ cmd_cfgcheck = $(srctree)/scripts/check-config.sh $2 \ - $(srctree)/scripts/config_whitelist.txt $(srctree) +@@ -980,7 +980,7 @@ endif + + BOARD_DTS_EXIST = $(shell if [ -f $(DTS_PATH)/$(BOARD_DTS_NAME).dts ]; then echo yes; else echo no; fi;) + +-DEVICE_BOARD_DTS_EXIST = $(shell if [ -f $(LICHEE_BOARD_CONFIG_DIR)/uboot-board.dts ]; then echo yes; else echo no; fi;) ++DEVICE_BOARD_DTS_EXIST = $(shell if [ -f $(LICHEE_BOARD_CONFIG_DIR)/sun8i-mangopi-mq-dual-uboot.dts ]; then echo yes; else echo no; fi;) - BOARD_DTS_EXIST=$(shell if [ -f $(DTS_PATH)/$(LICHEE_IC)-$(LICHEE_BOARD)-board.dts ]; then echo yes; else echo no; fi;) --DEVICE_BOARD_DTS_EXIST=$(shell if [ -f $(LICHEE_BOARD_CONFIG_DIR)/uboot-board.dts ]; then echo yes; else echo no; fi;) -+DEVICE_BOARD_DTS_EXIST=$(shell if [ -f $(LICHEE_BOARD_CONFIG_DIR)/sun8i-mangopi-mq-dual-uboot.dts ]; then echo yes; else echo no; fi;) DTS_WARNNING_SKIP := -W no-unit_address_vs_reg \ -W no-unit_address_format \ - -W no-simple_bus_reg \ +@@ -988,7 +988,7 @@ DTS_WARNNING_SKIP := -W no-unit_address_vs_reg \ -W no-pwms_property ifeq (x$(DEVICE_BOARD_DTS_EXIST), xyes) # add depend on external dts, make sure dts in uboot up to date @@ -28,15 +29,6 @@ index 88c9e65..1216e1e 100644 endif all: $(ALL-y) cfg -@@ -997,7 +997,7 @@ dtbs: dts/dt.dtb - @: - dts/dt.dtb: u-boot - ifeq (x$(DEVICE_BOARD_DTS_EXIST), xyes) -- @-cp -v $(LICHEE_BOARD_CONFIG_DIR)/uboot-board.dts $(DTS_PATH)/.board-uboot.dts -+ @-cp -v $(LICHEE_BOARD_CONFIG_DIR)/sun8i-mangopi-mq-dual-uboot.dts $(DTS_PATH)/.board-uboot.dts - else - ifeq (x$(BOARD_DTS_EXIST),xyes) - @-cp -v $(DTS_PATH)/$(LICHEE_IC)-$(LICHEE_BOARD)-board.dts $(DTS_PATH)/.board-uboot.dts -- 2.17.1 diff --git a/buildroot/configs/mangopi_mq_dual_defconfig b/buildroot/configs/mangopi_mq_dual_defconfig index 6c4717b8..3396ac0d 100644 --- a/buildroot/configs/mangopi_mq_dual_defconfig +++ b/buildroot/configs/mangopi_mq_dual_defconfig @@ -1,14 +1,14 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y +BR2_ARM_EABI=y BR2_SVN="svn" BR2_JLEVEL=16 BR2_RELRO_NONE=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://releases.linaro.org/components/toolchain/binaries/7.2-2017.11/arm-linux-gnueabihf/gcc-linaro-7.2.1-2017.11-x86_64_arm-linux-gnueabihf.tar.xz" -BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-linux-gnueabihf" +BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/YuzukiHD/YuzukiSBC-Toolchains/releases/download/linaro-7.2.1/gcc-linaro-7.2.1-2017.11-x86_64_arm-linux-gnueabi.tar.xz" +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-linux-gnueabi" BR2_TOOLCHAIN_EXTERNAL_GCC_7=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y @@ -133,4 +133,4 @@ BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="board/allwinner-generic/sun8i-t113/dts/uboot/s BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENEXT2FS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y \ No newline at end of file diff --git a/buildroot/configs/mangopi_mq_dual_hf_defconfig b/buildroot/configs/mangopi_mq_dual_hf_defconfig new file mode 100644 index 00000000..6c4717b8 --- /dev/null +++ b/buildroot/configs/mangopi_mq_dual_hf_defconfig @@ -0,0 +1,136 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV4=y +BR2_SVN="svn" +BR2_JLEVEL=16 +BR2_RELRO_NONE=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://releases.linaro.org/components/toolchain/binaries/7.2-2017.11/arm-linux-gnueabihf/gcc-linaro-7.2.1-2017.11-x86_64_arm-linux-gnueabihf.tar.xz" +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-linux-gnueabihf" +BR2_TOOLCHAIN_EXTERNAL_GCC_7=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_TARGET_GENERIC_HOSTNAME="mangopi" +BR2_TARGET_GENERIC_ISSUE="Welcome to MangoPi Dual" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_SYSTEM_BIN_SH_BASH=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y +BR2_TARGET_TZ_INFO=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/allwinner-generic/sun8i-generic/scripts/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/mangopi/mq-dual/script/genimage.cfg sun8i-t113 sun8i-mangopi-mq-dual-linux.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Tina-Linux/longan-t113-linux-5.4.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="origin/master" +BR2_LINUX_KERNEL_PATCH="board/allwinner-generic/sun8i-t113/patch/linux board/mangopi/mq-dual/patch/linux" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/mangopi/mq-dual/configs/linux/linux_mangopi_mq_dual_defconfig" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/allwinner-generic/sun8i-t113/dts/linux/sun8iw20p1-linux.dtsi board/mangopi/mq-dual/dts/linux/sun8i-mangopi-mq-dual-linux.dts" +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_ALSA_UTILS=y +BR2_PACKAGE_ALSA_UTILS_AMIXER=y +BR2_PACKAGE_ALSA_UTILS_APLAY=y +BR2_PACKAGE_FAAD2=y +BR2_PACKAGE_FFMPEG=y +BR2_PACKAGE_FFMPEG_SWSCALE=y +BR2_PACKAGE_LAME=y +BR2_PACKAGE_MPG123=y +BR2_PACKAGE_MUSEPACK=y +BR2_PACKAGE_WAVPACK=y +BR2_PACKAGE_BZIP2=y +BR2_PACKAGE_LIBTOOL=y +BR2_PACKAGE_E2FSPROGS=y +BR2_PACKAGE_MTD=y +BR2_PACKAGE_DBUS=y +BR2_PACKAGE_DTV_SCAN_TABLES=y +BR2_PACKAGE_I2C_TOOLS=y +BR2_PACKAGE_MEMTESTER=y +BR2_PACKAGE_UBOOT_TOOLS=y +BR2_PACKAGE_LIBMAD=y +BR2_PACKAGE_LIBSAMPLERATE=y +BR2_PACKAGE_OPUS=y +BR2_PACKAGE_SBC=y +BR2_PACKAGE_SPEEX=y +BR2_PACKAGE_TINYALSA=y +BR2_PACKAGE_TREMOR=y +BR2_PACKAGE_VO_AACENC=y +BR2_PACKAGE_LIBGCRYPT=y +BR2_PACKAGE_LIBMD=y +BR2_PACKAGE_SQLITE=y +BR2_PACKAGE_LIBCONFIG=y +BR2_PACKAGE_LIBFUSE=y +BR2_PACKAGE_LIBJPEG=y +BR2_PACKAGE_LIBSVG_CAIRO=y +BR2_PACKAGE_LIBVA=y +BR2_PACKAGE_OPENJPEG=y +BR2_PACKAGE_WAYLAND=y +BR2_PACKAGE_WAYLAND_PROTOCOLS=y +BR2_PACKAGE_WEBP=y +BR2_PACKAGE_LIBXKBCOMMON=y +BR2_PACKAGE_MTDEV=y +BR2_PACKAGE_TSLIB=y +BR2_PACKAGE_JSON_C=y +BR2_PACKAGE_LIBDVDREAD=y +BR2_PACKAGE_LIBMPEG2=y +BR2_PACKAGE_LIBTHEORA=y +BR2_PACKAGE_LIBVPX=y +BR2_PACKAGE_X264=y +BR2_PACKAGE_LIBCURL=y +BR2_PACKAGE_LIBIDN=y +BR2_PACKAGE_LIBSRTP=y +BR2_PACKAGE_NEON=y +BR2_PACKAGE_RTMPDUMP=y +BR2_PACKAGE_LIBEVDEV=y +BR2_PACKAGE_LIBTASN1=y +BR2_PACKAGE_LIBUCI=y +BR2_PACKAGE_LIBFRIBIDI=y +BR2_PACKAGE_PCRE=y +BR2_PACKAGE_PCRE_16=y +BR2_PACKAGE_PCRE_32=y +BR2_PACKAGE_PCRE_UCP=y +BR2_PACKAGE_PCRE2=y +BR2_PACKAGE_PCRE2_16=y +BR2_PACKAGE_DNSMASQ=y +BR2_PACKAGE_DNSMASQ_DNSSEC=y +BR2_PACKAGE_DNSMASQ_IDN=y +BR2_PACKAGE_DNSMASQ_CONNTRACK=y +BR2_PACKAGE_HOSTAPD=y +BR2_PACKAGE_HOSTAPD_EAP=y +BR2_PACKAGE_HOSTAPD_WPS=y +BR2_PACKAGE_IPERF3=y +BR2_PACKAGE_IPTABLES=y +BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_ANDROID_TOOLS=y +BR2_PACKAGE_SWUPDATE=y +BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_LABEL="" +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Tina-Linux/longan-t113-u-boot-2018.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="origin/master" +BR2_TARGET_UBOOT_PATCH="board/allwinner-generic/sun8i-t113/patch/uboot board/mangopi/mq-dual/patch/uboot" +BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y +BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="board/mangopi/mq-dual/configs/uboot/uboot_mangopi_mq_dual_defconfig" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sun8iw20p1.bin" +BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="board/allwinner-generic/sun8i-t113/dts/uboot/sun8iw20p1-clk.dtsi board/allwinner-generic/sun8i-t113/dts/uboot/sun8iw20p1-soc-system.dtsi board/mangopi/mq-dual/dts/uboot/sun8i-mangopi-mq-dual-uboot.dts" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENEXT2FS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y