From 504fa1bb7165f06f9058716994d7975e78ab04f4 Mon Sep 17 00:00:00 2001 From: Diego Rondini Date: Mon, 4 Nov 2019 15:12:36 +0000 Subject: [PATCH] machine: remove U-Boot PREFERRED_VERSION Remove pointless U-Boot PREFERRED_VERSION, as meta-sunxi no longer provides its own u-boot recipe. Signed-off-by: Diego Rondini --- conf/machine/nanopi-m1-plus.conf | 2 -- conf/machine/nanopi-neo-air.conf | 2 -- conf/machine/nanopi-neo-plus2.conf | 2 -- conf/machine/nanopi-neo.conf | 2 -- conf/machine/nanopi-neo2.conf | 2 -- conf/machine/orange-pi-one.conf | 2 -- conf/machine/orange-pi-pc-plus.conf | 2 -- conf/machine/orange-pi-pc.conf | 2 -- conf/machine/orange-pi-zero-plus2.conf | 2 -- conf/machine/orange-pi-zero.conf | 2 -- conf/machine/pcduino.conf | 2 -- conf/machine/pine64-plus.conf | 2 -- 12 files changed, 24 deletions(-) diff --git a/conf/machine/nanopi-m1-plus.conf b/conf/machine/nanopi-m1-plus.conf index 410cedb..a9ccdf5 100644 --- a/conf/machine/nanopi-m1-plus.conf +++ b/conf/machine/nanopi-m1-plus.conf @@ -4,8 +4,6 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_u-boot = "v2018.09%" - KERNEL_DEVICETREE = "sun8i-h3-nanopi-m1-plus.dtb" UBOOT_MACHINE = "nanopi_m1_plus_defconfig" diff --git a/conf/machine/nanopi-neo-air.conf b/conf/machine/nanopi-neo-air.conf index 1638874..d18f13c 100644 --- a/conf/machine/nanopi-neo-air.conf +++ b/conf/machine/nanopi-neo-air.conf @@ -5,7 +5,5 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_u-boot = "v2018.09%" - KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo-air.dtb" UBOOT_MACHINE = "nanopi_neo_air_defconfig" diff --git a/conf/machine/nanopi-neo-plus2.conf b/conf/machine/nanopi-neo-plus2.conf index 1c68622..9eb810a 100644 --- a/conf/machine/nanopi-neo-plus2.conf +++ b/conf/machine/nanopi-neo-plus2.conf @@ -5,7 +5,5 @@ require conf/machine/include/sun50i.inc -PREFERRED_VERSION_u-boot = "v2018.09%" - KERNEL_DEVICETREE = "allwinner/sun50i-h5-nanopi-neo-plus2.dtb" UBOOT_MACHINE = "nanopi_neo_plus2_defconfig" diff --git a/conf/machine/nanopi-neo.conf b/conf/machine/nanopi-neo.conf index 44ee8d9..b644f97 100644 --- a/conf/machine/nanopi-neo.conf +++ b/conf/machine/nanopi-neo.conf @@ -4,8 +4,6 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_u-boot = "v2018.09%" - KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb" UBOOT_MACHINE = "nanopi_neo_defconfig" diff --git a/conf/machine/nanopi-neo2.conf b/conf/machine/nanopi-neo2.conf index e424e5c..9ce9a2c 100644 --- a/conf/machine/nanopi-neo2.conf +++ b/conf/machine/nanopi-neo2.conf @@ -5,7 +5,5 @@ require conf/machine/include/sun50i.inc -PREFERRED_VERSION_u-boot = "v2018.09%" - KERNEL_DEVICETREE = "allwinner/sun50i-h5-nanopi-neo2.dtb" UBOOT_MACHINE = "nanopi_neo2_defconfig" diff --git a/conf/machine/orange-pi-one.conf b/conf/machine/orange-pi-one.conf index fa16a99..de0d20f 100644 --- a/conf/machine/orange-pi-one.conf +++ b/conf/machine/orange-pi-one.conf @@ -4,8 +4,6 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_u-boot = "v2018.09%" - KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb" UBOOT_MACHINE = "orangepi_one_defconfig" diff --git a/conf/machine/orange-pi-pc-plus.conf b/conf/machine/orange-pi-pc-plus.conf index 7922c4f..914ccf7 100644 --- a/conf/machine/orange-pi-pc-plus.conf +++ b/conf/machine/orange-pi-pc-plus.conf @@ -4,8 +4,6 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_u-boot = "v2018.09%" - KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc-plus.dtb" UBOOT_MACHINE = "orangepi_pc_plus_defconfig" diff --git a/conf/machine/orange-pi-pc.conf b/conf/machine/orange-pi-pc.conf index 066184a..eb70d88 100644 --- a/conf/machine/orange-pi-pc.conf +++ b/conf/machine/orange-pi-pc.conf @@ -4,8 +4,6 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_u-boot = "v2018.09%" - KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc.dtb" UBOOT_MACHINE = "orangepi_pc_defconfig" diff --git a/conf/machine/orange-pi-zero-plus2.conf b/conf/machine/orange-pi-zero-plus2.conf index bce00ac..50f12c0 100644 --- a/conf/machine/orange-pi-zero-plus2.conf +++ b/conf/machine/orange-pi-zero-plus2.conf @@ -5,7 +5,5 @@ require conf/machine/include/sun50i.inc -PREFERRED_VERSION_u-boot = "v2018.09%" - KERNEL_DEVICETREE = "allwinner/sun50i-h5-orangepi-zero-plus2.dtb" UBOOT_MACHINE = "orangepi_zero_plus2_defconfig" diff --git a/conf/machine/orange-pi-zero.conf b/conf/machine/orange-pi-zero.conf index 22a1643..9db12de 100644 --- a/conf/machine/orange-pi-zero.conf +++ b/conf/machine/orange-pi-zero.conf @@ -4,8 +4,6 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_u-boot = "v2018.09%" - KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb" UBOOT_MACHINE = "orangepi_zero_defconfig" diff --git a/conf/machine/pcduino.conf b/conf/machine/pcduino.conf index 6573ab6..8adb51e 100644 --- a/conf/machine/pcduino.conf +++ b/conf/machine/pcduino.conf @@ -4,8 +4,6 @@ require conf/machine/include/sun4i.inc -PREFERRED_VERSION_u-boot = "v2018.09%" - KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb" UBOOT_MACHINE = "Linksprite_pcDuino_defconfig" SUNXI_FEX_FILE = "sys_config/a10/pcduino.fex" diff --git a/conf/machine/pine64-plus.conf b/conf/machine/pine64-plus.conf index f443bb4..a56e7c4 100644 --- a/conf/machine/pine64-plus.conf +++ b/conf/machine/pine64-plus.conf @@ -5,7 +5,5 @@ require conf/machine/include/sun50i.inc -PREFERRED_VERSION_u-boot = "v2018.09%" - KERNEL_DEVICETREE = "allwinner/sun50i-a64-pine64-plus.dtb" UBOOT_MACHINE = "pine64_plus_defconfig"