  CONFIG_ARM_L1_CACHE_SHIFT=5
  CONFIG_ARM_NR_BANKS=8
  # CONFIG_ARM_SP805_WATCHDOG is not set
+@@ -22,11 +25,6 @@
  CONFIG_ARM_THUMB=y
  CONFIG_ARM_UNWIND=y
  CONFIG_AVERAGE=y

 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_ARCH_NR_GPIO=0
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
@@ -12,21 +13,18 @@
 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set
 CONFIG_ARM=y
 CONFIG_ARM_AMBA=y

 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_UEVENT_HELPER_PATH=""
 # CONFIG_UID16 is not set
Index: target/linux/brcm2708/image/Makefile
===================================================================
--- target/linux/brcm2708/image/Makefile	(revision 36720)
+++ target/linux/brcm2708/image/Makefile	(working copy)
@@ -20,27 +20,22 @@
 
 	mkdosfs $(KDIR)/boot.img -C $(FAT32_BLOCKS)
 	# Raspberry Pi has no bootloader, instead the GPU loads and starts the kernel
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/arm128_start.elf ::
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/arm192_start.elf ::
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/arm224_start.elf ::
 	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/bootcode.bin ::
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/COPYING.linux ::
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/LICENCE.broadcom ::
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/loader.bin ::
-	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/arm$(2)_start.elf ::start.elf  #Copy file for memory/gpu division
+	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/start.elf ::
+	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/start_cd.elf ::
+	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/fixup.dat ::
+	mcopy -i $(KDIR)/boot.img $(BUILD_DIR)/brcm2708-gpu-fw-boot/fixup_cd.dat ::
+	mcopy -i $(KDIR)/boot.img config.txt ::
 	mcopy -i $(KDIR)/boot.img cmdline.txt ::
 	mcopy -i $(KDIR)/boot.img $(KDIR)/Image ::kernel.img  # Copy OpenWrt built kernel
-	./gen_rpi_sdcard_img.sh $(BIN_DIR)/$(IMG_PREFIX)-sdcard-vfat-$(1)_$(2).img $(KDIR)/boot.img $(KDIR)/root.$(1) \
+	./gen_rpi_sdcard_img.sh $(BIN_DIR)/$(IMG_PREFIX)-sdcard-vfat-$(1).img $(KDIR)/boot.img $(KDIR)/root.$(1) \
 		$(CONFIG_BRCM2708_SD_BOOT_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE)
 endef
 
 define Image/Build
 	$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1).img
-	$(CP) $(KDIR)/Image $(BIN_DIR)/$(IMG_PREFIX)-Image
 
-	$(call Image/Build/RaspberryPi,$(1),128)
-	$(call Image/Build/RaspberryPi,$(1),192)
-	$(call Image/Build/RaspberryPi,$(1),224)
+	$(call Image/Build/RaspberryPi,$(1))
 endef
 
 $(eval $(call BuildImage))
Index: target/linux/brcm2708/image/cmdline.txt
===================================================================
--- target/linux/brcm2708/image/cmdline.txt	(revision 36720)
+++ target/linux/brcm2708/image/cmdline.txt	(working copy)
@@ -1 +1 @@
-dwc_otg.lpm_enable=0 rpitestmode=1 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait
+dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait
Index: target/linux/brcm2708/image/config.txt
===================================================================
--- target/linux/brcm2708/image/config.txt	(revision 0)
+++ target/linux/brcm2708/image/config.txt	(working copy)
@@ -0,0 +1,6 @@
+gpu_mem=32
+arm_freq=800
+arm_freq_min=700
+sdram_freq=400
+core_freq=250
+
Index: target/linux/brcm2708/image/gen_rpi_sdcard_img.sh
===================================================================
--- target/linux/brcm2708/image/gen_rpi_sdcard_img.sh	(revision 36720)
+++ target/linux/brcm2708/image/gen_rpi_sdcard_img.sh	(working copy)
@@ -12,7 +12,7 @@
 BOOTFSSIZE="$4"
 ROOTFSSIZE="$5"
 
-head=4
+head=255
 sect=63
 
 set `ptgen -o $OUTPUT -h $head -s $sect -l 4096 -t c -p ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M`
