From 4240612f213639ee284942a7c40dbdb56b34cfa2 Mon Sep 17 00:00:00 2001 From: Nicolas Aguirre Date: Tue, 16 Jun 2015 00:20:39 +0200 Subject: [PATCH] Use SOC_FAMILY to avoid the long list of COMPATIBLE_MACHINE It uses 3 different SOC_FAMILY sun4i,sun5i,sun7i this list come from here http://sunxi.org/Allwinner_SoC_Family Adding a new machine should be now more easy, as we have now to only create a new machine.conf file, set the right SOC_FAMILY and include the right arch inclue. --- conf/machine/bananapi.conf | 16 ++------------ conf/machine/cubieboard.conf | 16 ++------------ conf/machine/cubieboard2.conf | 18 +++------------- conf/machine/cubietruck.conf | 16 ++------------ conf/machine/forfun-q88db.conf | 11 ++-------- conf/machine/include/sun4i.inc | 5 +++++ conf/machine/include/sun5i.inc | 5 +++++ conf/machine/include/sun7i.inc | 5 +++++ conf/machine/include/sunxi.inc | 17 +++++++++++++-- conf/machine/mele.conf | 16 ++------------ conf/machine/meleg.conf | 14 ++----------- conf/machine/olinuxino-a10.conf | 15 ++----------- conf/machine/olinuxino-a10lime.conf | 13 ++---------- conf/machine/olinuxino-a10s.conf | 16 ++------------ conf/machine/olinuxino-a13.conf | 16 ++------------ conf/machine/olinuxino-a13som.conf | 11 ++-------- conf/machine/olinuxino-a20.conf | 13 ++---------- conf/machine/olinuxino-a20lime.conf | 13 ++---------- conf/machine/olinuxino-a20lime2.conf | 13 ++---------- conf/machine/olinuxino-a20som.conf | 11 ++-------- .../sunxi-board-fex/sunxi-board-fex.bb | 18 +--------------- recipes-bsp/u-boot/u-boot-sunxi.bb | 21 ++++--------------- recipes-bsp/u-boot/u-boot_2015.07rc2.bb | 21 ++++--------------- recipes-graphics/libgles/sunxi-mali_git.bb | 2 +- recipes-kernel/linux/linux-mainline_4.0.bb | 2 +- recipes-kernel/linux/linux_3.4.bb | 2 +- 26 files changed, 75 insertions(+), 251 deletions(-) create mode 100644 conf/machine/include/sun4i.inc create mode 100644 conf/machine/include/sun5i.inc create mode 100644 conf/machine/include/sun7i.inc diff --git a/conf/machine/bananapi.conf b/conf/machine/bananapi.conf index 9bea7e3..6af0a59 100644 --- a/conf/machine/bananapi.conf +++ b/conf/machine/bananapi.conf @@ -2,19 +2,7 @@ #@NAME: Bananapi #@DESCRIPTION: Machine configuration for the bananapi, based on allwinner A20 CPU http://bananapi.org/ -# Only has DVI connector for external screen -GUI_MACHINE_CLASS = "bigscreen" - -require conf/machine/include/tune-cortexa7.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc +require conf/machine/include/sun7i.inc UBOOT_MACHINE = "Bananapi_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -KERNEL_DEVICETREE = "sun7i-a20-bananapi.dtb" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "screen apm usbgadget usbhost vfat" +SUNXI_FEX_FILE = "sys_config/a20/Bananapi.fex" \ No newline at end of file diff --git a/conf/machine/cubieboard.conf b/conf/machine/cubieboard.conf index b1a9477..1bf20a1 100644 --- a/conf/machine/cubieboard.conf +++ b/conf/machine/cubieboard.conf @@ -2,19 +2,7 @@ #@NAME: CubieBoard #@DESCRIPTION: Machine configuration for the cubieboard, based on allwinner a10 CPU http://cubieboard.org/ -# Only has DVI connector for external screen -GUI_MACHINE_CLASS = "bigscreen" - -require conf/machine/include/tune-cortexa8.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc +require conf/machine/include/sun4i.inc UBOOT_MACHINE = "Cubieboard_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -KERNEL_DEVICETREE = "sun4i-a10-cubieboard.dtb" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +SUNXI_FEX_FILE = "sys_config/a10/cubieboard.fex" diff --git a/conf/machine/cubieboard2.conf b/conf/machine/cubieboard2.conf index 5b18da7..5aa31f5 100644 --- a/conf/machine/cubieboard2.conf +++ b/conf/machine/cubieboard2.conf @@ -2,19 +2,7 @@ #@NAME: CubieBoard2 #@DESCRIPTION: Machine configuration for the cubieboard2, based on allwinner A20 CPU http://cubieboard.org/ -# Only has DVI connector for external screen -GUI_MACHINE_CLASS = "bigscreen" +require conf/machine/include/sun7i.inc -require conf/machine/include/tune-cortexa7.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc - -UBOOT_MACHINE = "Cubieboard2_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -KERNEL_DEVICETREE = "sun7i-a20-cubieboard2.dtb" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "screen apm usbgadget usbhost vfat" +UBOOT_MACHINE = "Cubieboard_config" +SUNXI_FEX_FILE = "sys_config/a20/cubieboard2.fex" \ No newline at end of file diff --git a/conf/machine/cubietruck.conf b/conf/machine/cubietruck.conf index f7049a3..610390c 100644 --- a/conf/machine/cubietruck.conf +++ b/conf/machine/cubietruck.conf @@ -2,19 +2,7 @@ #@NAME: Cubietruck #@DESCRIPTION: Machine configuration for the Cubietruck, based on allwinner A20 CPU http://cubieboard.org/ -# Only has DVI connector for external screen -GUI_MACHINE_CLASS = "bigscreen" - -require conf/machine/include/tune-cortexa7.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc +require conf/machine/include/sun7i.inc UBOOT_MACHINE = "Cubietruck_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -KERNEL_DEVICETREE = "sun7i-a20-cubietruck.dtb" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "screen apm usbgadget usbhost vfat" +SUNXI_FEX_FILE = "sys_config/a20/cubietruck.fex" \ No newline at end of file diff --git a/conf/machine/forfun-q88db.conf b/conf/machine/forfun-q88db.conf index a0bf25e..1bb286a 100644 --- a/conf/machine/forfun-q88db.conf +++ b/conf/machine/forfun-q88db.conf @@ -3,14 +3,7 @@ #@DESCRIPTION: Machine configuration for the Forfun Q88DB Tablet with A13 CPU #http://linux-sunxi.org/Forfun_Q88DB -require conf/machine/include/tune-cortexa8.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc +require conf/machine/include/sun5i.inc UBOOT_MACHINE = "forfun_q88db_defconfig" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +SUNXI_FEX_FILE = "sys_config/a13/forfun_q88db.fex" \ No newline at end of file diff --git a/conf/machine/include/sun4i.inc b/conf/machine/include/sun4i.inc new file mode 100644 index 0000000..b0db3e8 --- /dev/null +++ b/conf/machine/include/sun4i.inc @@ -0,0 +1,5 @@ +require conf/machine/include/sunxi.inc +require conf/machine/include/sunxi-mali.inc +require conf/machine/include/tune-cortexa8.inc + +SOC_FAMILY = "sun4i" diff --git a/conf/machine/include/sun5i.inc b/conf/machine/include/sun5i.inc new file mode 100644 index 0000000..85733b2 --- /dev/null +++ b/conf/machine/include/sun5i.inc @@ -0,0 +1,5 @@ +require conf/machine/include/sunxi.inc +require conf/machine/include/sunxi-mali.inc +require conf/machine/include/tune-cortexa8.inc + +SOC_FAMILY = "sun5i" diff --git a/conf/machine/include/sun7i.inc b/conf/machine/include/sun7i.inc new file mode 100644 index 0000000..b78adc5 --- /dev/null +++ b/conf/machine/include/sun7i.inc @@ -0,0 +1,5 @@ +require conf/machine/include/sunxi.inc +require conf/machine/include/sunxi-mali.inc +require conf/machine/include/tune-cortexa7.inc + +SOC_FAMILY = "sun7i" diff --git a/conf/machine/include/sunxi.inc b/conf/machine/include/sunxi.inc index 1d86894..a5bead1 100644 --- a/conf/machine/include/sunxi.inc +++ b/conf/machine/include/sunxi.inc @@ -1,3 +1,10 @@ +SOC_FAMILY ??= "" +include conf/machine/include/soc-family.inc + +# Sub-architecture support +MACHINE_SOCARCH_SUFFIX ?= "" +MACHINE_SOCARCH_SUFFIX_sun4i = "-sun4i" + PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ xf86-video-fbturbo \ @@ -11,11 +18,17 @@ PREFERRED_VERSION_linux-libc-headers = "3.4.61" PREFERRED_PROVIDER_u-boot = "u-boot" PREFERRED_PROVIDER_virtual/bootloader = "u-boot" -KERNEL_IMAGETYPE = "uImage" +KERNEL_IMAGETYPE ?= "uImage" IMAGE_CLASSES += "sdcard_image-sunxi" IMAGE_FSTYPES += "ext3 tar.gz sunxi-sdimg" MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" -UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}" \ No newline at end of file +UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}" + +UBOOT_ENTRYPOINT ?= "0x40008000" +UBOOT_LOADADDRESS ?= "0x400080OB00" + +SERIAL_CONSOLE ?= "115200 ttyS0" +MACHINE_FEATURES ?= "alsa apm keyboard rtc serial screen usbgadget usbhost vfat" diff --git a/conf/machine/mele.conf b/conf/machine/mele.conf index 41141e8..ab81276 100644 --- a/conf/machine/mele.conf +++ b/conf/machine/mele.conf @@ -2,19 +2,7 @@ #@NAME: Mele a1000/a2000 #@DESCRIPTION: Machine configuration for the Mele a1000 and a2000, base on allwinner a10 CPU -# Only has DVI connector for external screen -GUI_MACHINE_CLASS = "bigscreen" - -require conf/machine/include/tune-cortexa8.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc +require conf/machine/include/sun4i.inc UBOOT_MACHINE = "Mele_A1000_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -KERNEL_DEVICETREE = "sun4i-a10-a1000.dtb" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +SUNXI_FEX_FILE = "sys_config/a10/mele_a1000.fex" \ No newline at end of file diff --git a/conf/machine/meleg.conf b/conf/machine/meleg.conf index f36f1dd..d1b0930 100644 --- a/conf/machine/meleg.conf +++ b/conf/machine/meleg.conf @@ -2,17 +2,7 @@ #@NAME: Mele a1000g/a2000g #@DESCRIPTION: Machine configuration for the Mele a1000g and a2000g, base on allwinner a10 CPU -# Only has DVI connector for external screen -GUI_MACHINE_CLASS = "bigscreen" - -require conf/machine/include/tune-cortexa8.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc +require conf/machine/include/sun4i.inc UBOOT_MACHINE = "Mele_A1000G_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +SUNXI_FEX_FILE = "sys_config/a10/mele_a1000g.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a10.conf b/conf/machine/olinuxino-a10.conf index 7e7c4da..f2d3ff7 100644 --- a/conf/machine/olinuxino-a10.conf +++ b/conf/machine/olinuxino-a10.conf @@ -3,18 +3,7 @@ #@DESCRIPTION: Machine configuration for Olimex A10-OLinuXino-LIME Board, based on Allwinner A10 CPU #https://github.com/OLIMEX/OLINUXINO -# There are also LCD possibilities -GUI_MACHINE_CLASS = "bigscreen" - -require conf/machine/include/tune-cortexa8.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc - +require conf/machine/include/sun4i.inc UBOOT_MACHINE = "A10-OLinuXino-Lime_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +SUNXI_FEX_FILE = "sys_config/a10/a10-olinuxino-lime.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a10lime.conf b/conf/machine/olinuxino-a10lime.conf index 9622873..16ffcf6 100644 --- a/conf/machine/olinuxino-a10lime.conf +++ b/conf/machine/olinuxino-a10lime.conf @@ -3,16 +3,7 @@ #@DESCRIPTION: Machine configuration for the Olimex A10-OLinuXino Lime Board, based on Allwinner A10 CPU #https://github.com/OLIMEX/OLINUXINO -require conf/machine/include/tune-cortexa8.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc +require conf/machine/include/sun4i.inc UBOOT_MACHINE = "A10-OLinuXino-Lime_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -KERNEL_DEVICETREE = "sun4i-a10-olinuxino-lime.dtb" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +SUNXI_FEX_FILE = "sys_config/a10/a10-olinuxino-lime.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a10s.conf b/conf/machine/olinuxino-a10s.conf index 9452c51..89e72d7 100644 --- a/conf/machine/olinuxino-a10s.conf +++ b/conf/machine/olinuxino-a10s.conf @@ -3,19 +3,7 @@ #@DESCRIPTION: Machine configuration for Olimex A10S-OLinuXino-MICRO Board, based on Allwinner A10s CPU #https://github.com/OLIMEX/OLINUXINO -# There are also LCD possibilities -GUI_MACHINE_CLASS = "bigscreen" - -require conf/machine/include/tune-cortexa8.inc -require conf/machine/include/sunxi.inc - +require conf/machine/include/sun5i.inc UBOOT_MACHINE = "A10s-OLinuXino-Micro_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -KERNEL_DEVICETREE = "sun5i-a10s-olinuxino-micro.dtb" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +SUNXI_FEX_FILE = "sys_config/a10s/a10s-olinuxino-m.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a13.conf b/conf/machine/olinuxino-a13.conf index 0709afb..34b3016 100644 --- a/conf/machine/olinuxino-a13.conf +++ b/conf/machine/olinuxino-a13.conf @@ -3,19 +3,7 @@ #@DESCRIPTION: Machine configuration for the Olime A13-OLinuXino Board, base on allwinner a13 CPU #https://github.com/OLIMEX/OLINUXINO -# Only has DVI connector for external screen -GUI_MACHINE_CLASS = "bigscreen" - -require conf/machine/include/tune-cortexa8.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc +require conf/machine/include/sun5i.inc UBOOT_MACHINE = "A13-OLinuXino_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -KERNEL_DEVICETREE = "sun5i-a13-olinuxino.dtb" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +SUNXI_FEX_FILE = "sys_config/a13/a13-olinuxino.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a13som.conf b/conf/machine/olinuxino-a13som.conf index 1082b89..c8535c7 100644 --- a/conf/machine/olinuxino-a13som.conf +++ b/conf/machine/olinuxino-a13som.conf @@ -3,14 +3,7 @@ #@DESCRIPTION: Machine configuration for the Olimex A13-SOM Evaluation Board, based on Allwinner A13 CPU #https://github.com/OLIMEX/SOM -require conf/machine/include/tune-cortexa8.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc +require conf/machine/include/sun5i.inc UBOOT_MACHINE = "OLIMEX-A13-SOM_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +SUNXI_FEX_FILE = "sys_config/a13/olimex_a13_som.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a20.conf b/conf/machine/olinuxino-a20.conf index 353b0f6..01c4336 100644 --- a/conf/machine/olinuxino-a20.conf +++ b/conf/machine/olinuxino-a20.conf @@ -3,16 +3,7 @@ #@DESCRIPTION: Machine configuration for the Olimex A20-OLinuXino Board, based on Allwinner A20 CPU #https://github.com/OLIMEX/OLINUXINO -require conf/machine/include/tune-cortexa7.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc +require conf/machine/include/sun7i.inc UBOOT_MACHINE = "A20-OLinuXino-Micro_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -KERNEL_DEVICETREE = "sun7i-a20-olinuxino-micro.dtb" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_micro.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a20lime.conf b/conf/machine/olinuxino-a20lime.conf index 00a2988..2c13243 100644 --- a/conf/machine/olinuxino-a20lime.conf +++ b/conf/machine/olinuxino-a20lime.conf @@ -3,16 +3,7 @@ #@DESCRIPTION: Machine configuration for the Olimex A20-OLinuXino Lime Board, based on Allwinner A20 CPU #https://github.com/OLIMEX/OLINUXINO -require conf/machine/include/tune-cortexa7.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc +require conf/machine/include/sun7i.inc UBOOT_MACHINE = "A20-OLinuXino-Lime_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime.dtb" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a20lime2.conf b/conf/machine/olinuxino-a20lime2.conf index 7c729c3..e55149b 100644 --- a/conf/machine/olinuxino-a20lime2.conf +++ b/conf/machine/olinuxino-a20lime2.conf @@ -3,16 +3,7 @@ #@DESCRIPTION: Machine configuration for the Olimex A20-OLinuXino Lime2 Board, based on Allwinner A20 CPU #https://github.com/OLIMEX/OLINUXINO -require conf/machine/include/tune-cortexa7.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc +require conf/machine/include/sun7i.inc UBOOT_MACHINE = "A20-OLinuXino_Lime2_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime2.dtb" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_lime2.fex" \ No newline at end of file diff --git a/conf/machine/olinuxino-a20som.conf b/conf/machine/olinuxino-a20som.conf index 0d1aa0b..5eb5c5c 100644 --- a/conf/machine/olinuxino-a20som.conf +++ b/conf/machine/olinuxino-a20som.conf @@ -3,14 +3,7 @@ #@DESCRIPTION: Machine configuration for the Olimex A20-SOM Evaluation Board, based on Allwinner A20 CPU #https://github.com/OLIMEX/SOM -require conf/machine/include/tune-cortexa7.inc -require conf/machine/include/sunxi.inc -require conf/machine/include/sunxi-mali.inc +require conf/machine/include/sun7i.inc UBOOT_MACHINE = "Olimex_A20-SOM_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" +SUNXI_FEX_FILE = "sys_config/a20/olimex_a20_som.fex" \ No newline at end of file diff --git a/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb b/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb index eab7ba7..2dc2e14 100644 --- a/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb +++ b/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb @@ -7,29 +7,13 @@ DEPENDS = "sunxi-tools-native" PV = "1.1+git${SRCPV}" PR = "r0" -COMPATIBLE_MACHINE = "(bananapi|cubieboard|cubieboard2|cubietruck|forfun-q88db|mele|meleg|olinuxino-a10|olinuxino-a10lime|olinuxino-a10s|olinuxino-a13|olinuxino-a13som|olinuxino-a20|olinuxino-a20lime|olinuxino-a20lime2|olinuxino-a20som)" +COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)" SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=git" # Increase PV with SRCREV change SRCREV = "bf02cb81d1fe5996758322dc74e66808c1c7ad38" S = "${WORKDIR}/git" -SUNXI_FEX_FILE_bananapi = "sys_config/a20/Bananapi.fex" -SUNXI_FEX_FILE_cubieboard = "sys_config/a10/cubieboard.fex" -SUNXI_FEX_FILE_cubieboard2 = "sys_config/a20/cubieboard2.fex" -SUNXI_FEX_FILE_cubietruck = "sys_config/a20/cubietruck.fex" -SUNXI_FEX_FILE_forfun-q88db = "sys_config/a13/forfun_q88db.fex" -SUNXI_FEX_FILE_mele = "sys_config/a10/mele_a1000.fex" -SUNXI_FEX_FILE_meleg = "sys_config/a10/mele_a1000g.fex" -SUNXI_FEX_FILE_olinuxino-a10 = "sys_config/a10/a10-olinuxino-lime.fex" -SUNXI_FEX_FILE_olinuxino-a10s = "sys_config/a10s/a10s-olinuxino-m.fex" -SUNXI_FEX_FILE_olinuxino-a10lime = "sys_config/a10/a10-olinuxino-lime.fex" -SUNXI_FEX_FILE_olinuxino-a13 = "sys_config/a13/a13-olinuxino.fex" -SUNXI_FEX_FILE_olinuxino-a13som = "sys_config/a13/olimex_a13_som.fex" -SUNXI_FEX_FILE_olinuxino-a20 = "sys_config/a20/a20-olinuxino_micro.fex" -SUNXI_FEX_FILE_olinuxino-a20lime = "sys_config/a20/a20-olinuxino_lime.fex" -SUNXI_FEX_FILE_olinuxino-a20lime2 = "sys_config/a20/a20-olinuxino_lime2.fex" -SUNXI_FEX_FILE_olinuxino-a20som = "sys_config/a20/olimex_a20_som.fex" SUNXI_FEX_BIN_IMAGE = "fex-${MACHINE}-${PV}-${PR}.bin" SUNXI_FEX_BIN_IMAGE_SYMLINK = "fex-${MACHINE}.bin" diff --git a/recipes-bsp/u-boot/u-boot-sunxi.bb b/recipes-bsp/u-boot/u-boot-sunxi.bb index b764f89..d95660a 100644 --- a/recipes-bsp/u-boot/u-boot-sunxi.bb +++ b/recipes-bsp/u-boot/u-boot-sunxi.bb @@ -7,24 +7,11 @@ LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a # No patches for other machines yet -COMPATIBLE_MACHINE = "(bananapi|cubieboard|cubieboard2|cubietruck|forfun-q88db|mele|meleg|olinuxino-a10|olinuxino-a10lime|olinuxino-a10s|olinuxino-a13|olinuxino-a13som|olinuxino-a20|olinuxino-a20lime|olinuxino-a20lime2|olinuxino-a20som)" +COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)" -DEFAULT_PREFERENCE_bananapi="1" -DEFAULT_PREFERENCE_cubieboard="1" -DEFAULT_PREFERENCE_cubieboard2="1" -DEFAULT_PREFERENCE_cubietruck="1" -DEFAULT_PREFERENCE_forfun-q88db="1" -DEFAULT_PREFERENCE_mele="1" -DEFAULT_PREFERENCE_meleg="1" -DEFAULT_PREFERENCE_olinuxino-a10="1" -DEFAULT_PREFERENCE_olinuxino-a10lime="1" -DEFAULT_PREFERENCE_olinuxino-a10s="1" -DEFAULT_PREFERENCE_olinuxino-a13="1" -DEFAULT_PREFERENCE_olinuxino-a13som="1" -DEFAULT_PREFERENCE_olinuxino-a20="1" -DEFAULT_PREFERENCE_olinuxino-a20lime="1" -DEFAULT_PREFERENCE_olinuxino-a20lime2="1" -DEFAULT_PREFERENCE_olinuxino-a20som="1" +DEFAULT_PREFERENCE_sun4i="1" +DEFAULT_PREFERENCE_sun5i="1" +DEFAULT_PREFERENCE_sun7i="1" SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi" diff --git a/recipes-bsp/u-boot/u-boot_2015.07rc2.bb b/recipes-bsp/u-boot/u-boot_2015.07rc2.bb index 12d380c..25bf338 100644 --- a/recipes-bsp/u-boot/u-boot_2015.07rc2.bb +++ b/recipes-bsp/u-boot/u-boot_2015.07rc2.bb @@ -19,24 +19,11 @@ file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ file://Licenses/x11.txt;md5=b46f176c847b8742db02126fb8af92e2 \ " -COMPATIBLE_MACHINE = "(bananapi|cubieboard|cubieboard2|cubietruck|forfun-q88db|mele|meleg|olinuxino-a10|olinuxino-a10lime|olinuxino-a10s|olinuxino-a13|olinuxino-a13som|olinuxino-a20|olinuxino-a20lime|olinuxino-a20lime2|olinuxino-a20som)" +COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)" -DEFAULT_PREFERENCE_bananapi="1" -DEFAULT_PREFERENCE_cubieboard="1" -DEFAULT_PREFERENCE_cubieboard2="1" -DEFAULT_PREFERENCE_cubietruck="1" -DEFAULT_PREFERENCE_forfun-q88db="1" -DEFAULT_PREFERENCE_mele="1" -DEFAULT_PREFERENCE_meleg="1" -DEFAULT_PREFERENCE_olinuxino-a10="1" -DEFAULT_PREFERENCE_olinuxino-a10lime="1" -DEFAULT_PREFERENCE_olinuxino-a10s="1" -DEFAULT_PREFERENCE_olinuxino-a13="1" -DEFAULT_PREFERENCE_olinuxino-a13som="1" -DEFAULT_PREFERENCE_olinuxino-a20="1" -DEFAULT_PREFERENCE_olinuxino-a20lime="1" -DEFAULT_PREFERENCE_olinuxino-a20lime2="1" -DEFAULT_PREFERENCE_olinuxino-a20som="1" +DEFAULT_PREFERENCE_sun4i="1" +DEFAULT_PREFERENCE_sun5i="1" +DEFAULT_PREFERENCE_sun7i="1" # Mainline U-Boot uses different names for some boards UBOOT_MACHINE_olinuxino-a20 = "A20-OLinuXino_MICRO_config" diff --git a/recipes-graphics/libgles/sunxi-mali_git.bb b/recipes-graphics/libgles/sunxi-mali_git.bb index 193117a..b82ddf6 100644 --- a/recipes-graphics/libgles/sunxi-mali_git.bb +++ b/recipes-graphics/libgles/sunxi-mali_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "libGLES for the A10/A13 Allwinner processor with Mali 400 (X11)" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://README;md5=1b81a178e80ee888ee4571772699ab2c" -COMPATIBLE_MACHINE = "(bananapi|cubieboard|cubieboard2|cubietruck|forfun-q88db|mele|meleg|olinuxino-a10|olinuxino-a10lime|olinuxino-a10s|olinuxino-a13|olinuxino-a13som|olinuxino-a20|olinuxino-a20lime|olinuxino-a20lime2|olinuxino-a20som)" +COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)" DEPENDS = "virtual/libx11 libxau libxdmcp libdrm dri2proto libdri2 libump" # These libraries shouldn't get installed in world builds unless something diff --git a/recipes-kernel/linux/linux-mainline_4.0.bb b/recipes-kernel/linux/linux-mainline_4.0.bb index 8dbedf1..961f483 100644 --- a/recipes-kernel/linux/linux-mainline_4.0.bb +++ b/recipes-kernel/linux/linux-mainline_4.0.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "Mainline Linux kernel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" -COMPATIBLE_MACHINE = "(bananapi|cubieboard|cubieboard2|cubietruck|mele|olinuxino-a10lime|olinuxino-a10s|olinuxino-a13|olinuxino-a20|olinuxino-a20lime|olinuxino-a20lime2)" +COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)" inherit kernel diff --git a/recipes-kernel/linux/linux_3.4.bb b/recipes-kernel/linux/linux_3.4.bb index 2c75c1e..26db8b8 100644 --- a/recipes-kernel/linux/linux_3.4.bb +++ b/recipes-kernel/linux/linux_3.4.bb @@ -2,7 +2,7 @@ require linux.inc DESCRIPTION = "Linux kernel for Allwinner a10/a20 processors" -COMPATIBLE_MACHINE = "(bananapi|cubieboard|cubieboard2|cubietruck|forfun-q88db|mele|meleg|olinuxino-a10|olinuxino-a10lime|olinuxino-a10s|olinuxino-a13|olinuxino-a13som|olinuxino-a20|olinuxino-a20lime|olinuxino-a20lime2|olinuxino-a20som)" +COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)" PV = "3.4.90" PR = "r1"