diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/shr.conf | 2 | ||||
-rw-r--r-- | conf/machine/omap4430-panda.conf | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index 59ad0be135..415e44961c 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -53,7 +53,6 @@ INHERIT += "recipe_sanity" ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso" -ANGSTROM_BLACKLIST_pn-libnl = "libnld has been replaced by libnl2" ANGSTROM_BLACKLIST_pn-update-alternatives-cworth-native = "update-alternatives-cworth-native has been replaced by opkg implementation of u-a script" ANGSTROM_BLACKLIST_pn-update-alternatives-cworth = "update-alternatives-cworth has been replaced by opkg implementation of u-a script" ANGSTROM_BLACKLIST_pn-qt4-x11-free-gles = "qt4-x11-free is fine even without gles" @@ -79,7 +78,6 @@ ANGSTROM_BLACKLIST_pn-linux-jlime-current = "strange kernel, spank maintainer" ANGSTROM_BLACKLIST_pn-linux-ml403-mvista-2.6.x = "strange kernel, spank maintainer" ANGSTROM_BLACKLIST_pn-linux-davinci = "strange kernel, spank maintainer" - CVS_TARBALL_STASH += "http://build.shr-project.org/sources/" #The shr-mirrors.bbclass repleaces this diff --git a/conf/machine/omap4430-panda.conf b/conf/machine/omap4430-panda.conf index df2658e949..d7956906ea 100644 --- a/conf/machine/omap4430-panda.conf +++ b/conf/machine/omap4430-panda.conf @@ -4,12 +4,10 @@ require conf/machine/include/omap3.inc -EXTRA_IMAGEDEPENDS = "x-load-rsalveti u-boot-sakoman " - XLOAD_MACHINE = "omap4430panda_config" XLOAD_LOAD_ADDRESS = 0x40304350 -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-sakoman" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" UBOOT_MACHINE = "omap4_panda_config" PREFERRED_PROVIDER_virtual/kernel = "linux-omap4" |