summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/keystone.inc3
-rw-r--r--conf/machine/include/omap-a15.inc3
-rw-r--r--conf/machine/include/omap3.inc3
-rw-r--r--conf/machine/include/omap4.inc3
-rw-r--r--conf/machine/include/ti33x.inc3
-rw-r--r--conf/machine/include/ti43x.inc3
6 files changed, 12 insertions, 6 deletions
diff --git a/conf/machine/include/keystone.inc b/conf/machine/include/keystone.inc
index a9449b28..9a5c11fb 100644
--- a/conf/machine/include/keystone.inc
+++ b/conf/machine/include/keystone.inc
@@ -1,6 +1,7 @@
1SOC_FAMILY = "keystone" 1SOC_FAMILY = "keystone"
2require conf/machine/include/soc-family.inc 2require conf/machine/include/soc-family.inc
3 3
4DEFAULTTUNE ?= "cortexa15thf-neon"
4require conf/machine/include/tune-cortexa15.inc 5require conf/machine/include/tune-cortexa15.inc
5 6
6PREFERRED_PROVIDER_virtual/kernel = "linux-keystone" 7PREFERRED_PROVIDER_virtual/kernel = "linux-keystone"
@@ -8,7 +9,7 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot-keystone"
8PREFERRED_PROVIDER_u-boot = "u-boot-keystone" 9PREFERRED_PROVIDER_u-boot = "u-boot-keystone"
9 10
10# Increase this everytime you change something in the kernel 11# Increase this everytime you change something in the kernel
11MACHINE_KERNEL_PR = "r7" 12MACHINE_KERNEL_PR = "r8"
12 13
13KERNEL_IMAGETYPE = "uImage" 14KERNEL_IMAGETYPE = "uImage"
14 15
diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
index dcf973e2..3fef64e1 100644
--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -1,10 +1,11 @@
1SOC_FAMILY = "omap-a15" 1SOC_FAMILY = "omap-a15"
2require conf/machine/include/soc-family.inc 2require conf/machine/include/soc-family.inc
3 3
4DEFAULTTUNE ?= "cortexa15thf-neon"
4require conf/machine/include/tune-cortexa15.inc 5require conf/machine/include/tune-cortexa15.inc
5 6
6# Increase this everytime you change something in the kernel 7# Increase this everytime you change something in the kernel
7MACHINE_KERNEL_PR = "r3" 8MACHINE_KERNEL_PR = "r4"
8 9
9PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" 10PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
10PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" 11PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index c80939a7..e71630b0 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,6 +1,7 @@
1SOC_FAMILY = "omap3" 1SOC_FAMILY = "omap3"
2require conf/machine/include/soc-family.inc 2require conf/machine/include/soc-family.inc
3 3
4DEFAULTTUNE ?= "cortexa8thf-neon"
4require conf/machine/include/tune-cortexa8.inc 5require conf/machine/include/tune-cortexa8.inc
5 6
6PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" 7PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -16,7 +17,7 @@ XSERVER = "xserver-xorg \
16GUI_MACHINE_CLASS = "bigscreen" 17GUI_MACHINE_CLASS = "bigscreen"
17 18
18# Increase this everytime you change something in the kernel 19# Increase this everytime you change something in the kernel
19MACHINE_KERNEL_PR = "r125" 20MACHINE_KERNEL_PR = "r126"
20 21
21KERNEL_IMAGETYPE = "uImage" 22KERNEL_IMAGETYPE = "uImage"
22 23
diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
index cf71be10..066acca6 100644
--- a/conf/machine/include/omap4.inc
+++ b/conf/machine/include/omap4.inc
@@ -1,6 +1,7 @@
1SOC_FAMILY = "omap4" 1SOC_FAMILY = "omap4"
2require conf/machine/include/soc-family.inc 2require conf/machine/include/soc-family.inc
3 3
4DEFAULTTUNE ?= "cortexa9thf-neon"
4require conf/machine/include/tune-cortexa9.inc 5require conf/machine/include/tune-cortexa9.inc
5 6
6PREFERRED_PROVIDER_virtual/kernel = "linux-omap4" 7PREFERRED_PROVIDER_virtual/kernel = "linux-omap4"
@@ -13,7 +14,7 @@ XSERVER = "xserver-xorg \
13 xf86-video-omap" 14 xf86-video-omap"
14 15
15# Increase this everytime you change something in the kernel 16# Increase this everytime you change something in the kernel
16MACHINE_KERNEL_PR = "r1" 17MACHINE_KERNEL_PR = "r2"
17 18
18KERNEL_IMAGETYPE = "uImage" 19KERNEL_IMAGETYPE = "uImage"
19 20
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
index 17b968d8..53f38c96 100644
--- a/conf/machine/include/ti33x.inc
+++ b/conf/machine/include/ti33x.inc
@@ -1,6 +1,7 @@
1SOC_FAMILY = "ti33x" 1SOC_FAMILY = "ti33x"
2require conf/machine/include/soc-family.inc 2require conf/machine/include/soc-family.inc
3 3
4DEFAULTTUNE ?= "cortexa8thf-neon"
4require conf/machine/include/tune-cortexa8.inc 5require conf/machine/include/tune-cortexa8.inc
5 6
6PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" 7PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -16,7 +17,7 @@ XSERVER = "xserver-xorg \
16GUI_MACHINE_CLASS = "bigscreen" 17GUI_MACHINE_CLASS = "bigscreen"
17 18
18# Increase this everytime you change something in the kernel 19# Increase this everytime you change something in the kernel
19MACHINE_KERNEL_PR = "r21" 20MACHINE_KERNEL_PR = "r22"
20 21
21# Default providers, may need to override for specific machines 22# Default providers, may need to override for specific machines
22PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" 23PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc
index 89133804..8c5fa2d9 100644
--- a/conf/machine/include/ti43x.inc
+++ b/conf/machine/include/ti43x.inc
@@ -1,6 +1,7 @@
1SOC_FAMILY = "ti43x" 1SOC_FAMILY = "ti43x"
2require conf/machine/include/soc-family.inc 2require conf/machine/include/soc-family.inc
3 3
4DEFAULTTUNE ?= "cortexa9thf-neon"
4require conf/machine/include/tune-cortexa9.inc 5require conf/machine/include/tune-cortexa9.inc
5 6
6PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" 7PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -16,7 +17,7 @@ XSERVER = "xserver-xorg \
16GUI_MACHINE_CLASS = "bigscreen" 17GUI_MACHINE_CLASS = "bigscreen"
17 18
18# Increase this everytime you change something in the kernel 19# Increase this everytime you change something in the kernel
19MACHINE_KERNEL_PR = "r2" 20MACHINE_KERNEL_PR = "r3"
20 21
21# Default providers, may need to override for specific machines 22# Default providers, may need to override for specific machines
22PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" 23PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"