diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-07-05 18:15:55 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-07-21 10:59:32 -0300 |
commit | 4b9a587d6d781e5922ac7b747d8a9adf708994d9 (patch) | |
tree | 12f35ab9a2144043dcdb80db97261beae1b94dc9 /conf | |
parent | 97052301a516faa9ab8bc01b85d882b0884e98f4 (diff) | |
download | meta-fsl-arm-4b9a587d6d781e5922ac7b747d8a9adf708994d9.tar.gz |
u-boot-fslc: Update to 2014.07-based release
This updates the FSL Community's U-Boot fork to a 2014.07-based
release.
Along with the recipe revision changes, this modifies the default
kernel image to "zImage" as most machines maintained in meta-fsl-arm
now uses it.
The machines that are still using uImage are:
- imx31pdk
- imx35pdk
- imx53ard
- imx6dlsabreauto
- imx6solosabreauto
- imx6solosabresd
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/imx31pdk.conf | 1 | ||||
-rw-r--r-- | conf/machine/imx35pdk.conf | 1 | ||||
-rw-r--r-- | conf/machine/imx53ard.conf | 1 | ||||
-rw-r--r-- | conf/machine/imx6dlsabreauto.conf | 1 | ||||
-rw-r--r-- | conf/machine/imx6solosabreauto.conf | 1 | ||||
-rw-r--r-- | conf/machine/imx6solosabresd.conf | 1 | ||||
-rw-r--r-- | conf/machine/include/imx-base.inc | 2 |
7 files changed, 7 insertions, 1 deletions
diff --git a/conf/machine/imx31pdk.conf b/conf/machine/imx31pdk.conf index 50da78e..cf368eb 100644 --- a/conf/machine/imx31pdk.conf +++ b/conf/machine/imx31pdk.conf | |||
@@ -14,6 +14,7 @@ UBOOT_MAKE_TARGET = "u-boot-with-spl.bin" | |||
14 | UBOOT_SUFFIX = "bin" | 14 | UBOOT_SUFFIX = "bin" |
15 | UBOOT_MACHINE = "mx31pdk_config" | 15 | UBOOT_MACHINE = "mx31pdk_config" |
16 | UBOOT_BINARY = "u-boot-with-spl.bin" | 16 | UBOOT_BINARY = "u-boot-with-spl.bin" |
17 | KERNEL_IMAGETYPE = "uImage" | ||
17 | 18 | ||
18 | IMAGE_FSTYPES = "ubi jffs2 tar.bz2" | 19 | IMAGE_FSTYPES = "ubi jffs2 tar.bz2" |
19 | MKUBIFS_ARGS = "-m 2048 -e 129024 -c 2030" | 20 | MKUBIFS_ARGS = "-m 2048 -e 129024 -c 2030" |
diff --git a/conf/machine/imx35pdk.conf b/conf/machine/imx35pdk.conf index b49e9f2..a3fc60c 100644 --- a/conf/machine/imx35pdk.conf +++ b/conf/machine/imx35pdk.conf | |||
@@ -12,6 +12,7 @@ UBOOT_MACHINE = "mx35pdk_config" | |||
12 | UBOOT_SUFFIX = "bin" | 12 | UBOOT_SUFFIX = "bin" |
13 | UBOOT_BINARY = "u-boot.bin" | 13 | UBOOT_BINARY = "u-boot.bin" |
14 | UBOOT_MAKE_TARGET = "u-boot.bin" | 14 | UBOOT_MAKE_TARGET = "u-boot.bin" |
15 | KERNEL_IMAGETYPE = "uImage" | ||
15 | 16 | ||
16 | GUI_MACHINE_CLASS = "bigscreen" | 17 | GUI_MACHINE_CLASS = "bigscreen" |
17 | 18 | ||
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf index 2da165a..8a64e22 100644 --- a/conf/machine/imx53ard.conf +++ b/conf/machine/imx53ard.conf | |||
@@ -12,6 +12,7 @@ SOC_FAMILY = "mx5:mx53" | |||
12 | KERNEL_DEVICETREE = "imx53-ard.dtb" | 12 | KERNEL_DEVICETREE = "imx53-ard.dtb" |
13 | 13 | ||
14 | UBOOT_MACHINE = "mx53ard_config" | 14 | UBOOT_MACHINE = "mx53ard_config" |
15 | KERNEL_IMAGETYPE = "uImage" | ||
15 | 16 | ||
16 | MACHINE_FIRMWARE += "linux-firmware-ar3k \ | 17 | MACHINE_FIRMWARE += "linux-firmware-ar3k \ |
17 | linux-firmware-ath6k" | 18 | linux-firmware-ath6k" |
diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf index 29d79d5..6477ba4 100644 --- a/conf/machine/imx6dlsabreauto.conf +++ b/conf/machine/imx6dlsabreauto.conf | |||
@@ -13,6 +13,7 @@ KERNEL_DEVICETREE += "imx6dl-sabreauto-flexcan1.dtb " | |||
13 | 13 | ||
14 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" | 14 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" |
15 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" | 15 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" |
16 | KERNEL_IMAGETYPE = "uImage" | ||
16 | 17 | ||
17 | UBOOT_CONFIG ??= "sd" | 18 | UBOOT_CONFIG ??= "sd" |
18 | UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard" | 19 | UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard" |
diff --git a/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf index 255c189..5f3782d 100644 --- a/conf/machine/imx6solosabreauto.conf +++ b/conf/machine/imx6solosabreauto.conf | |||
@@ -11,6 +11,7 @@ KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" | |||
11 | 11 | ||
12 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" | 12 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" |
13 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" | 13 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" |
14 | KERNEL_IMAGETYPE = "uImage" | ||
14 | 15 | ||
15 | UBOOT_CONFIG ??= "sd" | 16 | UBOOT_CONFIG ??= "sd" |
16 | UBOOT_CONFIG[sd] = "mx6solosabreauto_config,sdcard" | 17 | UBOOT_CONFIG[sd] = "mx6solosabreauto_config,sdcard" |
diff --git a/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf index f670ed3..085463a 100644 --- a/conf/machine/imx6solosabresd.conf +++ b/conf/machine/imx6solosabresd.conf | |||
@@ -12,6 +12,7 @@ KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb" | |||
12 | 12 | ||
13 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" | 13 | PREFERRED_PROVIDER_u-boot = "u-boot-imx" |
14 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" | 14 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" |
15 | KERNEL_IMAGETYPE = "uImage" | ||
15 | 16 | ||
16 | UBOOT_CONFIG ??= "sd" | 17 | UBOOT_CONFIG ??= "sd" |
17 | UBOOT_CONFIG[sd] = "mx6solosabresd_config,sdcard" | 18 | UBOOT_CONFIG[sd] = "mx6solosabresd_config,sdcard" |
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 9ac5e8a..9f0217e 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -103,6 +103,6 @@ IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard" | |||
103 | 103 | ||
104 | SERIAL_CONSOLE = "115200 ttymxc0" | 104 | SERIAL_CONSOLE = "115200 ttymxc0" |
105 | 105 | ||
106 | KERNEL_IMAGETYPE = "uImage" | 106 | KERNEL_IMAGETYPE = "zImage" |
107 | 107 | ||
108 | MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen" | 108 | MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen" |