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/machine | |
parent | 976542da706f11ca6b03d456c8d82f13b314a758 (diff) | |
parent | 3431bdd1b242a6076b4f47d721f6d8a7614733c9 (diff) |
merge of '155f936fb623fd266abcbacae678f48bbbecc4ab'
and 'f3d1266d2f4720b12cbb374f4f9fea9b58b0e6aa'
Diffstat (limited to 'conf/machine')
-rw-r--r-- | conf/machine/omap5912osk.conf | 2 |
1 files changed, 1 insertions, 1 deletions
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" |