From e29f55e8feb34307bb272e0603d9852bce698568 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Wed, 30 Aug 2017 20:53:28 +0300 Subject: [PATCH] Use per-branch u-boot defconfig names for sun50iw1 --- config/boards/pine64.conf | 1 + config/boards/pine64so.conf | 1 + config/boards/pinebook-a64.conf | 1 + config/sources/sun50iw1.conf | 2 -- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/boards/pine64.conf b/config/boards/pine64.conf index 562b547fa0..58c202cee1 100644 --- a/config/boards/pine64.conf +++ b/config/boards/pine64.conf @@ -1,6 +1,7 @@ # A64 quad core 512MB-2GB SoC GBE BOARD_NAME="Pine64" LINUXFAMILY="sun50iw1" +BOOTCONFIG_DEFAULT="sun50iw1p1_config" BOOTCONFIG="pine64_plus_defconfig" # MODULES="sunxi_codec sunxi_i2s sunxi_sndcodec 8723bs" diff --git a/config/boards/pine64so.conf b/config/boards/pine64so.conf index 70417dd01f..f9f35f4d70 100644 --- a/config/boards/pine64so.conf +++ b/config/boards/pine64so.conf @@ -1,6 +1,7 @@ # A64 quad core 2GB SoC GBE BOARD_NAME="SoPine A64" LINUXFAMILY="sun50iw1" +BOOTCONFIG_DEFAULT="sun50iw1p1_config" BOOTCONFIG="sopine_baseboard_defconfig" # MODULES="sunxi_codec sunxi_i2s sunxi_sndcodec 8723bs" diff --git a/config/boards/pinebook-a64.conf b/config/boards/pinebook-a64.conf index 1242cf417f..3d6018dca7 100644 --- a/config/boards/pinebook-a64.conf +++ b/config/boards/pinebook-a64.conf @@ -1,6 +1,7 @@ # A64 quad core 2GB SoC Wi-Fi/BT BOARD_NAME="Pinebook A64" LINUXFAMILY="sun50iw1" +BOOTCONFIG_DEFAULT="sun50iw1p1_config" BOOTCONFIG="pinebook-a64_defconfig" # MODULES="sunxi_codec sunxi_i2s sunxi_sndcodec 8723cs r8152 hall" diff --git a/config/sources/sun50iw1.conf b/config/sources/sun50iw1.conf index 14d85bdd0d..978ddc8c44 100644 --- a/config/sources/sun50iw1.conf +++ b/config/sources/sun50iw1.conf @@ -22,8 +22,6 @@ case $BRANCH in UBOOT_TARGET_MAP=';;u-boot-with-dtb.bin' BOOTPATCHDIR='u-boot-pine64-default' - # legacy u-boot has one defconfig for all boards - BOOTCONFIG='sun50iw1p1_config' UBOOT_COMPILER='arm-linux-gnueabihf-' UBOOT_USE_GCC='> 5.0'