From 4b74d640a29bfc05a471d72d1e371385a5f8e16f Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Wed, 20 Apr 2016 03:47:32 +0000 Subject: conf: update old machines to use linux-ti-staging and u-boot-ti-staging Signed-off-by: Denys Dmytriyenko --- conf/machine/include/davinci.inc | 9 +++++---- conf/machine/include/omap3.inc | 9 +++++---- conf/machine/include/omap4.inc | 3 ++- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index 9f90f24b..59e423d7 100644 --- a/conf/machine/include/davinci.inc +++ b/conf/machine/include/davinci.inc @@ -1,12 +1,13 @@ require conf/machine/include/tune-arm926ejs.inc # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r53" +MACHINE_KERNEL_PR = "r54" -KERNEL_IMAGETYPE = "uImage" +KERNEL_IMAGETYPE = "zImage" -PREFERRED_PROVIDER_virtual/kernel = "linux-mainline" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" UBOOT_MACHINE = "davinci_dvevm_config" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index f83bfa22..3a841409 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -17,13 +17,14 @@ XSERVER = "xserver-xorg \ MACHINE_GUI_CLASS = "bigscreen" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r126" +MACHINE_KERNEL_PR = "r127" -KERNEL_IMAGETYPE = "uImage" +KERNEL_IMAGETYPE = "zImage" # Default providers, may need to override for specific machines -PREFERRED_PROVIDER_virtual/kernel = "linux-mainline" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" UBOOT_ARCH = "arm" UBOOT_MACHINE = "omap3_evm_config" diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc index 1657326e..deb33169 100644 --- a/conf/machine/include/omap4.inc +++ b/conf/machine/include/omap4.inc @@ -6,6 +6,7 @@ require conf/machine/include/tune-cortexa9.inc PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ @@ -14,7 +15,7 @@ XSERVER = "xserver-xorg \ xf86-video-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r3" +MACHINE_KERNEL_PR = "r4" KERNEL_IMAGETYPE = "zImage" -- cgit v1.2.3-54-g00ecf