diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-05-28 10:09:40 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-05-28 10:09:40 +0200 |
| commit | cc2eccd9c67c534a3fb8184148d57a5d22540217 (patch) | |
| tree | 2494e4456c50ea8787544343954c67f66c96f6c0 /conf/machine | |
| parent | 99dd85f176d8dbc1f81ed96b8bd2409ba3dbcd32 (diff) | |
| parent | 3c4e35bd4385607d581734014b3857467292abad (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/at91cap9adk.conf | 1 | ||||
| -rw-r--r-- | conf/machine/at91sam9260ek.conf | 3 | ||||
| -rw-r--r-- | conf/machine/at91sam9261ek.conf | 3 | ||||
| -rw-r--r-- | conf/machine/at91sam9263ek.conf | 1 | ||||
| -rw-r--r-- | conf/machine/at91sam9g20ek.conf | 1 | ||||
| -rw-r--r-- | conf/machine/at91sam9rlek.conf | 3 | ||||
| -rw-r--r-- | conf/machine/include/omap3.inc | 2 |
7 files changed, 4 insertions, 10 deletions
diff --git a/conf/machine/at91cap9adk.conf b/conf/machine/at91cap9adk.conf index 50549dabf6..87311e9be4 100644 --- a/conf/machine/at91cap9adk.conf +++ b/conf/machine/at91cap9adk.conf @@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" UBOOT_MACHINE = "at91cap9adk_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf index 3882c118fb..9a7ca9af62 100644 --- a/conf/machine/at91sam9260ek.conf +++ b/conf/machine/at91sam9260ek.conf @@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" -UBOOT_MACHINE = "at92sam9260ek_config" +UBOOT_MACHINE = "at91sam9260ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf index a3a9be6dc1..79f275f483 100644 --- a/conf/machine/at91sam9261ek.conf +++ b/conf/machine/at91sam9261ek.conf @@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" -UBOOT_MACHINE = "at92sam9261ek_config" +UBOOT_MACHINE = "at91sam9261ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf index e633148172..f052170aed 100644 --- a/conf/machine/at91sam9263ek.conf +++ b/conf/machine/at91sam9263ek.conf @@ -10,7 +10,6 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" UBOOT_MACHINE = "at91sam9263ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf index 38078b6d03..7dc6ba0d53 100644 --- a/conf/machine/at91sam9g20ek.conf +++ b/conf/machine/at91sam9g20ek.conf @@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" UBOOT_MACHINE = "at91sam9g20ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9rlek.conf b/conf/machine/at91sam9rlek.conf index ba19cb3e00..f7a78dcf75 100644 --- a/conf/machine/at91sam9rlek.conf +++ b/conf/machine/at91sam9rlek.conf @@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" -UBOOT_MACHINE = "at92sam9rlek_config" +UBOOT_MACHINE = "at91sam9rlek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index bb4fa7eaf0..1b47888ab7 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r34" +MACHINE_KERNEL_PR = "r35" KERNEL_IMAGETYPE = "uImage" |