diff --git a/config/sources/cubox.conf b/config/sources/cubox.conf index 27557c2bcd..539200de1a 100644 --- a/config/sources/cubox.conf +++ b/config/sources/cubox.conf @@ -1,7 +1,6 @@ BOOTSOURCE='https://github.com/SolidRun/u-boot-imx6' BOOTBRANCH='branch:imx6' BOOTDIR='u-boot-cubox' -BOOTPATCHDIR='u-boot-cubox' BOOTSCRIPT='boot-cubox.cmd:boot.cmd' BOOTENV_FILE='cubox-default.txt' diff --git a/config/sources/mvebu.conf b/config/sources/mvebu.conf index 1ac1c19206..eb8230babb 100644 --- a/config/sources/mvebu.conf +++ b/config/sources/mvebu.conf @@ -1,7 +1,6 @@ BOOTSOURCE='https://github.com/SolidRun/u-boot-armada38x' BOOTBRANCH='branch:u-boot-2013.01-15t1-clearfog' BOOTDIR='u-boot-armada' -BOOTPATCHDIR='u-boot-armada' BOOTSCRIPT='boot-marvell.cmd:boot.cmd' UBOOT_TARGET_MAP="u-boot.mmc;;u-boot.mmc u-boot-uart.mmc diff --git a/config/sources/odroidc1.conf b/config/sources/odroidc1.conf index 3fe0cb2a9d..0c5fe2b4cf 100644 --- a/config/sources/odroidc1.conf +++ b/config/sources/odroidc1.conf @@ -1,7 +1,6 @@ BOOTSOURCE='https://github.com/hardkernel/u-boot.git' BOOTBRANCH='branch:odroidc-v2011.03' BOOTDIR='u-boot-odroidc1' -BOOTPATCHDIR='u-boot-odroidc1' UBOOT_USE_GCC='< 4.9' BOOTSCRIPT="boot-odroid-c1.ini:boot.ini" diff --git a/config/sources/odroidc2.conf b/config/sources/odroidc2.conf index bc6c2307d4..64b1f525ac 100644 --- a/config/sources/odroidc2.conf +++ b/config/sources/odroidc2.conf @@ -1,7 +1,6 @@ BOOTSOURCE='https://github.com/hardkernel/u-boot.git' BOOTBRANCH='branch:odroidc2-v2015.01' BOOTDIR='u-boot-odroidc2' -BOOTPATCHDIR='u-boot-odroidc2' UBOOT_USE_GCC='< 5.0' BOOTSCRIPT="boot-odroid-c2.ini:boot.ini" diff --git a/config/sources/rda8810.conf b/config/sources/rda8810.conf index 0cfa05bbcf..a0b0ede37b 100644 --- a/config/sources/rda8810.conf +++ b/config/sources/rda8810.conf @@ -1,7 +1,6 @@ BOOTSOURCE='https://github.com/zador-blood-stained/u-boot-orangepi2g' BOOTBRANCH='branch:master' BOOTDIR='u-boot-rda8810' -BOOTPATCHDIR='u-boot-rda8810' BOOTSCRIPT='boot-rda8810.cmd:boot.cmd' BOOTENV_FILE='rda8810-default.txt' diff --git a/config/sources/s500.conf b/config/sources/s500.conf index 66bd6507d1..9d1c454a3a 100644 --- a/config/sources/s500.conf +++ b/config/sources/s500.conf @@ -14,7 +14,6 @@ case $BOARD in BOOTSOURCE='https://github.com/LeMaker/u-boot-actions' BOOTBRANCH='branch:s500-master' BOOTDIR='u-boot-s500' - BOOTPATCHDIR='u-boot-s500' UBOOT_TARGET_MAP="u-boot-dtb.img;;$SRC/lib/bin/s500-bootloader-guitar.bin u-boot-dtb.img" SERIALCON=ttyS3 ;; diff --git a/config/sources/sunxi_common.inc b/config/sources/sunxi_common.inc index 7991bed9db..838021d0cc 100644 --- a/config/sources/sunxi_common.inc +++ b/config/sources/sunxi_common.inc @@ -3,7 +3,7 @@ BOOTDIR=$MAINLINE_UBOOT_DIR BOOTBRANCH=$MAINLINE_UBOOT_BRANCH BOOTSCRIPT="boot-sunxi.cmd:boot.cmd" BOOTENV_FILE='sunxi-default.txt' -BOOTPATCHDIR="u-boot-sunxi" +BOOTPATCHDIR='u-boot-sunxi' UBOOT_TARGET_MAP=';;u-boot-sunxi-with-spl.bin' @@ -13,6 +13,10 @@ UBOOT_FW_ENV='0x88000,0x20000' # /etc/fw_env.config offset and env size HAS_UUID_SUPPORT=yes BOOTDELAY=0 +# Here we want to rename LINUXFAMILY from sun4i, sun5i, etc for next and dev branches +# except for sun8i-dev which is separate from sunxi-dev +[[ $BRANCH != default && ! ( $LINUXFAMILY == sun8i && $BRANCH == dev ) ]] && LINUXFAMILY=sunxi + case $BRANCH in default) GOVERNOR=interactive diff --git a/config/sources/udoo.conf b/config/sources/udoo.conf index 39cf14cb82..3b095d3740 100644 --- a/config/sources/udoo.conf +++ b/config/sources/udoo.conf @@ -1,6 +1,5 @@ BOOTSOURCE='https://github.com/UDOOboard/uboot-imx' BOOTDIR='u-boot-udoo' -BOOTPATCHDIR='u-boot-udoo' BOOTSCRIPT="boot-$BOARD.cmd:boot.cmd" UBOOT_TARGET_MAP=';;SPL u-boot.img' diff --git a/configuration.sh b/configuration.sh index 6b316fd240..0bc890ab0f 100644 --- a/configuration.sh +++ b/configuration.sh @@ -93,13 +93,10 @@ case $ARCH in ;; esac -# Here we want to use linux-sunxi-next and linux-sunxi-dev configs for sun*i -# except for sun8i-dev which is separate from sunxi-dev -[[ $LINUXFAMILY == sun*i && $BRANCH != default && ! ( $LINUXFAMILY == sun8i && $BRANCH == dev ) ]] && \ - LINUXCONFIG="linux-sunxi-${BRANCH}" - [[ -z $LINUXCONFIG ]] && LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}" +[[ -z $BOOTPATCHDIR ]] && BOOTPATCHDIR="u-boot-$LINUXFAMILY" + if [[ $RELEASE == xenial ]]; then DISTRIBUTION="Ubuntu"; else DISTRIBUTION="Debian"; fi # Essential packages diff --git a/main.sh b/main.sh index 86e524b685..6efc342ad3 100644 --- a/main.sh +++ b/main.sh @@ -213,12 +213,6 @@ fi compile_sunxi_tools -# Here we want to rename LINUXFAMILY from sun4i, sun5i, etc for next and dev branches -# except for sun8i-dev which is separate from sunxi-dev -if [[ $LINUXFAMILY == sun*i && $BRANCH != default ]]; then - [[ ! ( $LINUXFAMILY == sun8i && $BRANCH == dev ) ]] && LINUXFAMILY="sunxi" -fi - # define package names DEB_BRANCH=${BRANCH//default} # if not empty, append hyphen diff --git a/patch/u-boot/u-boot-armada/add-spinor-and-sata-targets.patch b/patch/u-boot/u-boot-mvebu/add-spinor-and-sata-targets.patch similarity index 100% rename from patch/u-boot/u-boot-armada/add-spinor-and-sata-targets.patch rename to patch/u-boot/u-boot-mvebu/add-spinor-and-sata-targets.patch diff --git a/patch/u-boot/u-boot-armada/board_clearfogbase/add-fdtfile-env-clearfog-base.patch b/patch/u-boot/u-boot-mvebu/board_clearfogbase/add-fdtfile-env-clearfog-base.patch similarity index 100% rename from patch/u-boot/u-boot-armada/board_clearfogbase/add-fdtfile-env-clearfog-base.patch rename to patch/u-boot/u-boot-mvebu/board_clearfogbase/add-fdtfile-env-clearfog-base.patch diff --git a/patch/u-boot/u-boot-armada/board_clearfogbase/adjust-clearfog-base-ethernet.patch b/patch/u-boot/u-boot-mvebu/board_clearfogbase/adjust-clearfog-base-ethernet.patch similarity index 100% rename from patch/u-boot/u-boot-armada/board_clearfogbase/adjust-clearfog-base-ethernet.patch rename to patch/u-boot/u-boot-mvebu/board_clearfogbase/adjust-clearfog-base-ethernet.patch diff --git a/patch/u-boot/u-boot-armada/board_clearfogpro/add-fdtfile-env-clearfog-pro.patch b/patch/u-boot/u-boot-mvebu/board_clearfogpro/add-fdtfile-env-clearfog-pro.patch similarity index 100% rename from patch/u-boot/u-boot-armada/board_clearfogpro/add-fdtfile-env-clearfog-pro.patch rename to patch/u-boot/u-boot-mvebu/board_clearfogpro/add-fdtfile-env-clearfog-pro.patch diff --git a/patch/u-boot/u-boot-armada/loading-boot-scr.patch b/patch/u-boot/u-boot-mvebu/loading-boot-scr.patch similarity index 100% rename from patch/u-boot/u-boot-armada/loading-boot-scr.patch rename to patch/u-boot/u-boot-mvebu/loading-boot-scr.patch diff --git a/patch/u-boot/u-boot-armada/make-build-more-silent.patch b/patch/u-boot/u-boot-mvebu/make-build-more-silent.patch similarity index 100% rename from patch/u-boot/u-boot-armada/make-build-more-silent.patch rename to patch/u-boot/u-boot-mvebu/make-build-more-silent.patch diff --git a/patch/u-boot/u-boot-armada/slot0=mpci_1=sata.patch.disabled b/patch/u-boot/u-boot-mvebu/slot0=mpci_1=sata.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-armada/slot0=mpci_1=sata.patch.disabled rename to patch/u-boot/u-boot-mvebu/slot0=mpci_1=sata.patch.disabled diff --git a/patch/u-boot/u-boot-armada/slot0=sata_1=sata.patch.disabled b/patch/u-boot/u-boot-mvebu/slot0=sata_1=sata.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-armada/slot0=sata_1=sata.patch.disabled rename to patch/u-boot/u-boot-mvebu/slot0=sata_1=sata.patch.disabled diff --git a/patch/u-boot/u-boot-armada/target_sata/config-set-boot-device-sata.patch b/patch/u-boot/u-boot-mvebu/target_sata/config-set-boot-device-sata.patch similarity index 100% rename from patch/u-boot/u-boot-armada/target_sata/config-set-boot-device-sata.patch rename to patch/u-boot/u-boot-mvebu/target_sata/config-set-boot-device-sata.patch diff --git a/patch/u-boot/u-boot-armada/target_spi/config-set-boot-device-spinor.patch b/patch/u-boot/u-boot-mvebu/target_spi/config-set-boot-device-spinor.patch similarity index 100% rename from patch/u-boot/u-boot-armada/target_spi/config-set-boot-device-spinor.patch rename to patch/u-boot/u-boot-mvebu/target_spi/config-set-boot-device-spinor.patch diff --git a/patch/u-boot/u-boot-armada/tools-bin_hdr-compiler-fixes.patch b/patch/u-boot/u-boot-mvebu/tools-bin_hdr-compiler-fixes.patch similarity index 100% rename from patch/u-boot/u-boot-armada/tools-bin_hdr-compiler-fixes.patch rename to patch/u-boot/u-boot-mvebu/tools-bin_hdr-compiler-fixes.patch