meta-blackfinn: Unify layer structure

Signed-off-by: Thomas Klaehn <tkl@blackfinn.de>

buildconf/blackfinn-init-build-env

@@ -26,28 +26,24 @@ function print_config {
 DEFAULT_MACHINE=qemux86-64
 BUILD_DIR=build
 
-#print_help
+print_help
 
 if [ -z "$MACHINE" ]; then
-	MACH=$DEFAULT_MACHINE
+	MACHINE=$DEFAULT_MACHINE
-else
-	MACH=$MACHINE
 fi
 
-unset MACHINE
-
 if [ $# -eq "1" ]; then
 	BUILD_DIR=$1
 fi
 
-print_config $MACH $BUILD_DIR
+print_config $MACHINE $BUILD_DIR
 
 rm -f	build/conf/bblayers.conf \
 	build/conf/templateconf.cfg
 
 mkdir -p $BUILD_DIR
 
-export MACHINE=$MACH
+export MACHINE="$MACHINE"
 export TEMPLATECONF="../meta-blackfinn/buildconf/$MACHINE"
 
 source layers/poky/oe-init-build-env $BUILD_DIR

recipes-bsp/u-boot/u-boot_%.bbappend

@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-UBOOT_ENV_beaglebone-yocto = "uEnv"
+UBOOT_ENV = "uEnv"
 
 SRC_URI_append_beaglebone-yocto += " \
     file://uEnv.txt \

recipes-core/images/console-image.bb

@@ -84,10 +84,6 @@ IMAGE_INSTALL_beaglebone-yocto += "\
 	linux-firmware-rtl8192cu \
 "
 
-IMAGE_INSTALL_bananapi-m3 += "\
-	linux-firmware-bcm43430 \
-"
-
 set_local_timezone() {
     ln -sf /usr/share/zoneinfo/Europe/Berlin ${IMAGE_ROOTFS}/etc/localtime
 }

recipes-kernel/linux/files/beaglebone-yocto/0002-onboard-led-init-disable.patch

@@ -1,37 +0,0 @@
-diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 3e32dd18fd25..695634c7c895 100644
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -31,28 +31,28 @@
- 		led2 {
- 			label = "beaglebone:green:heartbeat";
- 			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
--			linux,default-trigger = "heartbeat";
-+			linux,default-trigger = "none"; /* heartbeat */
- 			default-state = "off";
- 		};
- 
- 		led3 {
- 			label = "beaglebone:green:mmc0";
- 			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
--			linux,default-trigger = "mmc0";
-+			linux,default-trigger = "none"; /* mmc0 */
- 			default-state = "off";
- 		};
- 
- 		led4 {
- 			label = "beaglebone:green:usr2";
- 			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
--			linux,default-trigger = "cpu0";
-+			linux,default-trigger = "none";	/* cpu0 */
- 			default-state = "off";
- 		};
- 
- 		led5 {
- 			label = "beaglebone:green:usr3";
- 			gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
--			linux,default-trigger = "mmc1";
-+			linux,default-trigger = "none";	/* mmc1 */
- 			default-state = "off";
- 		};
- 	};

recipes-kernel/linux/files/beaglebone-yocto/enable_hostap_wext.cfg

@@ -1,12 +0,0 @@
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_LIB80211=y
-CONFIG_LIB80211_CRYPT_WEP=y
-CONFIG_LIB80211_CRYPT_CCMP=y
-CONFIG_LIB80211_CRYPT_TKIP=y
-CONFIG_HOSTAP=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CFG80211_WEXT=y

recipes-kernel/linux/files/beaglebone-yocto/enable_onboard_leds.cfg

@@ -1,19 +0,0 @@
-CONFIG_RFKILL_LEDS=y
-CONFIG_INPUT_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_PWM=y
-CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_USER=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_MTD=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_LEDS_TRIGGER_TRANSIENT=y
-CONFIG_LEDS_TRIGGER_CAMERA=y
-CONFIG_LEDS_TRIGGER_PANIC=y

recipes-kernel/linux/files/beaglebone-yocto/rtl8192cu.cfg

@@ -1,5 +0,0 @@
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_USB=m
-CONFIG_RTLWIFI_DEBUG=y
-CONFIG_RTL8192C_COMMON=m

recipes-kernel/linux/linux-yocto_4.18.bbappend

@@ -1,18 +0,0 @@
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += " \
-	file://rtl8192cu.cfg \
-	file://enable_onboard_leds.cfg \
-	file://enable_hostap_wext.cfg \
-	file://0002-onboard-led-init-disable.patch \
-"
-
-KERNEL_CONFIG_FRAGMENTS_append_ti33x = " \
-  ${WORKDIR}/rtl8192cu.cfg \
-  ${WORKDIR}/enable_onboard_leds.cfg \
-  ${WORKDIR}/enable_hostap_wext.cfg \
-"
-