diff options
| -rw-r--r-- | conf/machine/nhk15.conf | 7 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.20.bb | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/conf/machine/nhk15.conf b/conf/machine/nhk15.conf index 40f10371f9..ad6227848b 100644 --- a/conf/machine/nhk15.conf +++ b/conf/machine/nhk15.conf @@ -6,15 +6,14 @@ TARGET_ARCH = "arm" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n -x lzo" -IMAGE_CMD_jffs2 = "mkdir -p ${DEPLOY_DIR_IMAGE}; \ - mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ - --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img ${EXTRA_IMAGECMD}; " - IMAGE_FSTYPES ?= "tar.bz2 ext2.gz jffs2" SERIAL_CONSOLE = "115200 ttyAMA1" PREFERRED_PROVIDER_virtual/kernel = "linux" +KERNEL_IMAGETYPE = "uImage" +UBOOT_ENTRYPOINT = "00008000" + PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-nomadik" XSERVER = "xserver-kdrive-nomadikfb" diff --git a/recipes/linux/linux_2.6.20.bb b/recipes/linux/linux_2.6.20.bb index 7a43dff9ce..d8427bfc6f 100644 --- a/recipes/linux/linux_2.6.20.bb +++ b/recipes/linux/linux_2.6.20.bb @@ -6,7 +6,7 @@ DEFAULT_PREFERENCE_at91sam9261ek = "20" DEFAULT_PREFERENCE_at91sam9260ek = "20" DEFAULT_PREFERENCE_nhk15 = "1" -PR = "r9" +PR = "r10" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://defconfig" |