summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/machine/imx51evk.conf3
-rw-r--r--conf/machine/imx53ard.conf3
-rw-r--r--conf/machine/imx53qsb.conf3
-rw-r--r--conf/machine/imx6qsabrelite.conf12
-rw-r--r--conf/machine/imx6qsabresd.conf12
-rw-r--r--conf/machine/include/imx-base.inc16
6 files changed, 15 insertions, 34 deletions
diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
index abf6740..2e27ed7 100644
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -2,7 +2,6 @@
2#@NAME: i.MX51 evaluation kit 2#@NAME: i.MX51 evaluation kit
3#@DESCRIPTION: Machine configuration for Freescale i.MX51 Evaluation Kit 3#@DESCRIPTION: Machine configuration for Freescale i.MX51 Evaluation Kit
4 4
5include conf/machine/include/soc-family.inc
6include conf/machine/include/imx-base.inc 5include conf/machine/include/imx-base.inc
7include conf/machine/include/tune-cortexa8.inc 6include conf/machine/include/tune-cortexa8.inc
8 7
@@ -10,6 +9,4 @@ SOC_FAMILY = "mx51:mx5"
10 9
11KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx51-babbage.dts" 10KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx51-babbage.dts"
12 11
13UBOOT_ENTRYPOINT = "0xa0000000"
14UBOOT_LOADADDRESS = "0xa0000000"
15UBOOT_MACHINE = "mx51evk_config" 12UBOOT_MACHINE = "mx51evk_config"
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index b8a121e..4f15493 100644
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -2,7 +2,6 @@
2#@NAME: i.MX53 SABRE Automotive board 2#@NAME: i.MX53 SABRE Automotive board
3#@DESCRIPTION: Machine configuration for Freescale i.MX53 SABRE Automotive board 3#@DESCRIPTION: Machine configuration for Freescale i.MX53 SABRE Automotive board
4 4
5include conf/machine/include/soc-family.inc
6include conf/machine/include/imx-base.inc 5include conf/machine/include/imx-base.inc
7include conf/machine/include/tune-cortexa8.inc 6include conf/machine/include/tune-cortexa8.inc
8 7
@@ -10,8 +9,6 @@ SOC_FAMILY = "mx53:mx5"
10 9
11KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-ard.dts" 10KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-ard.dts"
12 11
13UBOOT_ENTRYPOINT = "0x70800000"
14UBOOT_LOADADDRESS = "0x70800000"
15UBOOT_MACHINE = "mx53ard_config" 12UBOOT_MACHINE = "mx53ard_config"
16 13
17MACHINE_FIRMWARE += "firmware-imx-ar3k \ 14MACHINE_FIRMWARE += "firmware-imx-ar3k \
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index 274eb53..9aec913 100644
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -2,7 +2,6 @@
2#@NAME: i.MX53 Quick Start Board 2#@NAME: i.MX53 Quick Start Board
3#@DESCRIPTION: Machine configuration for Freescale i.MX53 Quick Start Board 3#@DESCRIPTION: Machine configuration for Freescale i.MX53 Quick Start Board
4 4
5include conf/machine/include/soc-family.inc
6include conf/machine/include/imx-base.inc 5include conf/machine/include/imx-base.inc
7include conf/machine/include/tune-cortexa8.inc 6include conf/machine/include/tune-cortexa8.inc
8 7
@@ -10,8 +9,6 @@ SOC_FAMILY = "mx53:mx5"
10 9
11KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts" 10KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts"
12 11
13UBOOT_ENTRYPOINT = "0x70800000"
14UBOOT_LOADADDRESS = "0x70800000"
15UBOOT_MACHINE = "mx53loco_config" 12UBOOT_MACHINE = "mx53loco_config"
16 13
17MACHINE_FIRMWARE += "firmware-imx-ar3k \ 14MACHINE_FIRMWARE += "firmware-imx-ar3k \
diff --git a/conf/machine/imx6qsabrelite.conf b/conf/machine/imx6qsabrelite.conf
index 0d96953..6a0cef9 100644
--- a/conf/machine/imx6qsabrelite.conf
+++ b/conf/machine/imx6qsabrelite.conf
@@ -2,7 +2,6 @@
2#@NAME: i.MX6Q SABRE Lite 2#@NAME: i.MX6Q SABRE Lite
3#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Lite 3#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Lite
4 4
5include conf/machine/include/soc-family.inc
6include conf/machine/include/imx-base.inc 5include conf/machine/include/imx-base.inc
7include conf/machine/include/tune-cortexa9.inc 6include conf/machine/include/tune-cortexa9.inc
8 7
@@ -10,19 +9,8 @@ SOC_FAMILY = "mx6q:mx6"
10 9
11KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabrelite.dts" 10KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabrelite.dts"
12 11
13UBOOT_ENTRYPOINT = "0x10800000"
14UBOOT_LOADADDRESS = "0x10800000"
15UBOOT_MACHINE = "mx6qsabrelite_config" 12UBOOT_MACHINE = "mx6qsabrelite_config"
16 13
17# Needs to override until all BSP is public
18MACHINE_GSTREAMER_PLUGIN = ""
19XSERVER = "xserver-xorg \
20 xf86-input-evdev \
21 xf86-video-fbdev"
22MACHINE_EXTRA_RRECOMMENDS = "kernel-modules \
23 imx-audio \
24 udev-extraconf"
25
26SERIAL_CONSOLE = "115200 ttymxc1" 14SERIAL_CONSOLE = "115200 ttymxc1"
27 15
28MACHINE_FEATURES += " pci wifi bluetooth" 16MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
index a1d150a..d5a5192 100644
--- a/conf/machine/imx6qsabresd.conf
+++ b/conf/machine/imx6qsabresd.conf
@@ -2,7 +2,6 @@
2#@NAME: i.MX6Q SABRE SD 2#@NAME: i.MX6Q SABRE SD
3#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE SD 3#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE SD
4 4
5include conf/machine/include/soc-family.inc
6include conf/machine/include/imx-base.inc 5include conf/machine/include/imx-base.inc
7include conf/machine/include/tune-cortexa9.inc 6include conf/machine/include/tune-cortexa9.inc
8 7
@@ -10,19 +9,8 @@ SOC_FAMILY = "mx6q:mx6"
10 9
11KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabresd.dts" 10KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabresd.dts"
12 11
13UBOOT_ENTRYPOINT = "0x10800000"
14UBOOT_LOADADDRESS = "0x10800000"
15UBOOT_MACHINE = "mx6qsabresd_config" 12UBOOT_MACHINE = "mx6qsabresd_config"
16 13
17# Needs to override until all BSP is public
18MACHINE_GSTREAMER_PLUGIN = ""
19XSERVER = "xserver-xorg \
20 xf86-input-evdev \
21 xf86-video-fbdev"
22MACHINE_EXTRA_RRECOMMENDS = "kernel-modules \
23 imx-audio \
24 udev-extraconf"
25
26SERIAL_CONSOLE = "115200 ttymxc0" 14SERIAL_CONSOLE = "115200 ttymxc0"
27 15
28MACHINE_FEATURES += " pci wifi bluetooth" 16MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 658df52..5658f28 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -4,6 +4,8 @@ include conf/machine/include/fsl-default-settings.inc
4include conf/machine/include/fsl-default-versions.inc 4include conf/machine/include/fsl-default-versions.inc
5include conf/machine/include/fsl-default-providers.inc 5include conf/machine/include/fsl-default-providers.inc
6 6
7include conf/machine/include/soc-family.inc
8
7# Disable perf features as 2.6.35.3 fail to build otherwise 9# Disable perf features as 2.6.35.3 fail to build otherwise
8PERF_FEATURES_ENABLE = "" 10PERF_FEATURES_ENABLE = ""
9 11
@@ -11,9 +13,20 @@ PERF_FEATURES_ENABLE = ""
11UBOOT_MAKE_TARGET = "u-boot.imx" 13UBOOT_MAKE_TARGET = "u-boot.imx"
12UBOOT_SUFFIX = "imx" 14UBOOT_SUFFIX = "imx"
13 15
16UBOOT_ENTRYPOINT_mx51 = "0xa0000000"
17UBOOT_LOADADDRESS_mx51 = "0xa0000000"
18
19UBOOT_ENTRYPOINT_mx53 = "0x70800000"
20UBOOT_LOADADDRESS_mx53 = "0x70800000"
21
22UBOOT_ENTRYPOINT_mx6 = "0x10800000"
23UBOOT_LOADADDRESS_mx6 = "0x10800000"
24
25XSERVER_DRIVER = "xf86-video-fbdev"
26XSERVER_DRIVER_mx5 = "xf86-video-imxfb"
14XSERVER = "xserver-xorg \ 27XSERVER = "xserver-xorg \
15 xf86-input-evdev \ 28 xf86-input-evdev \
16 xf86-video-imxfb" 29 ${XSERVER_DRIVER}"
17 30
18# Ship kernel modules 31# Ship kernel modules
19MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" 32MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
@@ -36,6 +49,7 @@ MACHINE_EXTRA_RRECOMMENDS += "imx-audio \
36 49
37# Gstreamer plugin 50# Gstreamer plugin
38MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin" 51MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
52MACHINE_GSTREAMER_PLUGIN_mx6 = ""
39 53
40PREFERRED_PROVIDER_virtual/egl_mx5 ?= "amd-gpu-x11-bin-mx51" 54PREFERRED_PROVIDER_virtual/egl_mx5 ?= "amd-gpu-x11-bin-mx51"
41PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-x11-bin-mx51" 55PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-x11-bin-mx51"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-17 04:39:11 +0000