From: Francois Perrad Date: Tue, 18 Sep 2018 16:35:23 +0000 (+0200) Subject: configs/olimex_a20_olinuxino_lime_mali: rename to olimex_a20_olinuxino_lime_legacy X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d756c736a9eb0551910377890ce36de8c04afd1e;p=buildroot.git configs/olimex_a20_olinuxino_lime_mali: rename to olimex_a20_olinuxino_lime_legacy This commit renames olimex_a20_olinuxino_lime_mali to olimex_a20_olinuxino_lime_legacy, because the upstream Linux kernel now also supports using the Mali GPU. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3d544b020..05e54ab6b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -171,7 +171,7 @@ olimex_a10_olinuxino_lime_defconfig: *defconfig olimex_a13_olinuxino_defconfig: *defconfig olimex_a20_olinuxino_lime2_defconfig: *defconfig olimex_a20_olinuxino_lime_defconfig: *defconfig -olimex_a20_olinuxino_lime_mali_defconfig: *defconfig +olimex_a20_olinuxino_lime_legacy_defconfig: *defconfig olimex_a20_olinuxino_micro_defconfig: *defconfig olimex_a64_olinuxino_defconfig: *defconfig olimex_imx233_olinuxino_defconfig: *defconfig diff --git a/board/olimex/a20_olinuxino/boot-legacy.cmd b/board/olimex/a20_olinuxino/boot-legacy.cmd new file mode 100644 index 0000000000..9fa5d65418 --- /dev/null +++ b/board/olimex/a20_olinuxino/boot-legacy.cmd @@ -0,0 +1,5 @@ +setenv bootm_boot_mode sec +setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 consoleblank=0 ${extra} +ext4load mmc 0 0x43000000 /boot/script.bin +ext4load mmc 0 0x48000000 /boot/zImage +bootz 0x48000000 diff --git a/board/olimex/a20_olinuxino/boot-mali.cmd b/board/olimex/a20_olinuxino/boot-mali.cmd deleted file mode 100644 index 9fa5d65418..0000000000 --- a/board/olimex/a20_olinuxino/boot-mali.cmd +++ /dev/null @@ -1,5 +0,0 @@ -setenv bootm_boot_mode sec -setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 consoleblank=0 ${extra} -ext4load mmc 0 0x43000000 /boot/script.bin -ext4load mmc 0 0x48000000 /boot/zImage -bootz 0x48000000 diff --git a/board/olimex/a20_olinuxino/readme.txt b/board/olimex/a20_olinuxino/readme.txt index 070b7a5ec7..57ee23d147 100644 --- a/board/olimex/a20_olinuxino/readme.txt +++ b/board/olimex/a20_olinuxino/readme.txt @@ -16,7 +16,7 @@ The following defconfigs are available: for the A20-OLinuXino-MICRO board using mainline kernel - olimex_a20_olinuxino_lime_defconfig for the A20-OLinuXino-LIME board using mainline kernel - - olimex_a20_olinuxino_lime_mali_defconfig + - olimex_a20_olinuxino_lime_legacy_defconfig for the A20-OLinuXino-LIME board using legacy linux-sunxi kernel - olimex_a20_olinuxino_lime2_defconfig for the A20-OLinuXino-LIME2 board using mainline kernel @@ -51,7 +51,7 @@ After building, you should get a tree like this: output/images/ +-- rootfs.ext2 +-- rootfs.ext4 -> rootfs.ext2 - +-- script.bin (lime_mali) + +-- script.bin (lime_legacy) +-- sdcard.img +-- sun7i-a20-olinuxino-lime.dtb (lime, mainline) +-- sun7i-a20-olinuxino-lime2.dtb (lime2, mainline) diff --git a/configs/olimex_a20_olinuxino_lime_legacy_defconfig b/configs/olimex_a20_olinuxino_lime_legacy_defconfig new file mode 100644 index 0000000000..c14c2ca995 --- /dev/null +++ b/configs/olimex_a20_olinuxino_lime_legacy_defconfig @@ -0,0 +1,53 @@ +# Architecture +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_EABIHF=y + +# Linux headers same as kernel, a 3.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y + +# System configuration +BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" +BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" + +# Kernel, based on Linux version 3.4.113 +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,dan-and,linux-sunxi,fc385cc6dfa350382ecc94a520a716b57e654410)/linux-fc385cc6dfa350382ecc94a520a716b57e654410.tar.gz" +BR2_LINUX_KERNEL_USE_DEFCONFIG=y +BR2_LINUX_KERNEL_DEFCONFIG="sun7i" +BR2_LINUX_KERNEL_INSTALL_TARGET=y + +# sunxi packages +BR2_PACKAGE_SUNXI_TOOLS=y +BR2_PACKAGE_SUNXI_BOARDS=y +BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/a20-olinuxino_lime.fex" +BR2_PACKAGE_SUNXI_MALI=y +BR2_PACKAGE_SUNXI_MALI_DBG=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set + +# Bootloaders +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_BOOT_SCRIPT=y +BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot-legacy.cmd" + +# Additional tools +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/olimex_a20_olinuxino_lime_mali_defconfig b/configs/olimex_a20_olinuxino_lime_mali_defconfig deleted file mode 100644 index f04d578f13..0000000000 --- a/configs/olimex_a20_olinuxino_lime_mali_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_EABIHF=y - -# Linux headers same as kernel, a 3.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" -BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" - -# Kernel, based on Linux version 3.4.113 -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,dan-and,linux-sunxi,fc385cc6dfa350382ecc94a520a716b57e654410)/linux-fc385cc6dfa350382ecc94a520a716b57e654410.tar.gz" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y -BR2_LINUX_KERNEL_DEFCONFIG="sun7i" -BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# sunxi packages -BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_BOARDS=y -BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/a20-olinuxino_lime.fex" -BR2_PACKAGE_SUNXI_MALI=y -BR2_PACKAGE_SUNXI_MALI_DBG=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_BIN=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot-mali.cmd" - -# Additional tools -BR2_PACKAGE_HOST_GENIMAGE=y