diff options
| author | Philip Balister <philip@balister.org> | 2007-01-02 22:05:49 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2007-01-02 22:05:49 +0000 |
| commit | 6ab27b7e5239c2837dfa0b87cb15dcf6fdba4be2 (patch) | |
| tree | 73fed49135f2a1847ccfced3aa535b6b18e03d6d /conf | |
| parent | 976542da706f11ca6b03d456c8d82f13b314a758 (diff) | |
| parent | 3431bdd1b242a6076b4f47d721f6d8a7614733c9 (diff) | |
merge of '155f936fb623fd266abcbacae678f48bbbecc4ab'
and 'f3d1266d2f4720b12cbb374f4f9fea9b58b0e6aa'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/openomap.conf | 3 | ||||
| -rw-r--r-- | conf/machine/omap5912osk.conf | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf index f73a980c52..5819b5ad59 100644 --- a/conf/distro/openomap.conf +++ b/conf/distro/openomap.conf @@ -23,8 +23,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" # use latest booting kernel but allow to override it in local.conf -PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.18-omap1" -#PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.18+git" +#PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.19-omap1" #use EABI toolchain diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index f8a3472f78..6e704a1f4e 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020" +# PREFERRED_VERSION_u-boot = "1.1.6" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" |