redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'sh/stable-updates'

hifive-unleashed-5.1
Paul Mundt 2009-10-26 19:46:59 +09:00
parent ef01b9a06d 9e24c7e2ac
commit a384fe55c2
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/Makefile
View File

@ -199,7 +199,7 @@ endif
libs-$(CONFIG_SUPERH32) := arch/sh/lib/ $(libs-y) libs-$(CONFIG_SUPERH32) := arch/sh/lib/ $(libs-y)
libs-$(CONFIG_SUPERH64) := arch/sh/lib64/ $(libs-y) libs-$(CONFIG_SUPERH64) := arch/sh/lib64/ $(libs-y)
BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec \ BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec uImage.bin \
zImage vmlinux.srec romImage zImage vmlinux.srec romImage
PHONY += maketools $(BOOT_TARGETS) FORCE PHONY += maketools $(BOOT_TARGETS) FORCE

4
arch/sh/boards/mach-rsk/devices-rsk7203.c
View File

@ -11,10 +11,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/map.h>
#include <linux/smsc911x.h> #include <linux/smsc911x.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/leds.h> #include <linux/leds.h>

23
arch/sh/boards/mach-rsk/setup.c
View File

@ -15,14 +15,12 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#ifdef CONFIG_MTD
#include <linux/mtd/map.h> #include <linux/mtd/map.h>
#endif
#include <asm/machvec.h> #include <asm/machvec.h>
#include <asm/io.h> #include <asm/io.h>
static const char *probes[] = { "cmdlinepart", NULL };
static struct mtd_partition *parsed_partitions;
static struct mtd_partition rsk_partitions[] = { static struct mtd_partition rsk_partitions[] = {
{ {
.name = "Bootloader", .name = "Bootloader",
@ -41,6 +39,8 @@ static struct mtd_partition rsk_partitions[] = {
}; };
static struct physmap_flash_data flash_data = { static struct physmap_flash_data flash_data = {
.parts = rsk_partitions,
.nr_parts = ARRAY_SIZE(rsk_partitions),
.width = 2, .width = 2,
}; };
@ -60,7 +60,8 @@ static struct platform_device flash_device = {
}, },
}; };
static struct mtd_info *flash_mtd; #ifdef CONFIG_MTD
static const char *probes[] = { "cmdlinepart", NULL };
static struct map_info rsk_flash_map = { static struct map_info rsk_flash_map = {
.name = "RSK+ Flash", .name = "RSK+ Flash",
@ -68,6 +69,10 @@ static struct map_info rsk_flash_map = {
.bankwidth = 2, .bankwidth = 2,
}; };
static struct mtd_info *flash_mtd;
static struct mtd_partition *parsed_partitions;
static void __init set_mtd_partitions(void) static void __init set_mtd_partitions(void)
{ {
int nr_parts = 0; int nr_parts = 0;
@ -77,14 +82,14 @@ static void __init set_mtd_partitions(void)
nr_parts = parse_mtd_partitions(flash_mtd, probes, nr_parts = parse_mtd_partitions(flash_mtd, probes,
&parsed_partitions, 0); &parsed_partitions, 0);
/* If there is no partition table, used the hard coded table */ /* If there is no partition table, used the hard coded table */
if (nr_parts <= 0) { if (nr_parts > 0) {
flash_data.parts = rsk_partitions;
flash_data.nr_parts = ARRAY_SIZE(rsk_partitions);
} else {
flash_data.nr_parts = nr_parts; flash_data.nr_parts = nr_parts;
flash_data.parts = parsed_partitions; flash_data.parts = parsed_partitions;
} }
} }
#else
static inline void set_mtd_partitions(void) {}
#endif
static struct platform_device *rsk_devices[] __initdata = { static struct platform_device *rsk_devices[] __initdata = {
&flash_device, &flash_device,

6
arch/sh/boot/Makefile
View File

@ -20,11 +20,12 @@ CONFIG_BOOT_LINK_OFFSET ?= 0x00800000
CONFIG_ZERO_PAGE_OFFSET ?= 0x00001000 CONFIG_ZERO_PAGE_OFFSET ?= 0x00001000
CONFIG_ENTRY_OFFSET ?= 0x00001000 CONFIG_ENTRY_OFFSET ?= 0x00001000
suffix-y := bin
suffix-$(CONFIG_KERNEL_GZIP) := gz suffix-$(CONFIG_KERNEL_GZIP) := gz
suffix-$(CONFIG_KERNEL_BZIP2) := bz2 suffix-$(CONFIG_KERNEL_BZIP2) := bz2
suffix-$(CONFIG_KERNEL_LZMA) := lzma suffix-$(CONFIG_KERNEL_LZMA) := lzma
targets := zImage vmlinux.srec romImage uImage uImage.srec uImage.gz uImage.bz2 uImage.lzma targets := zImage vmlinux.srec romImage uImage uImage.srec uImage.gz uImage.bz2 uImage.lzma uImage.bin
extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma
subdir- := compressed romimage subdir- := compressed romimage
@ -88,6 +89,9 @@ $(obj)/uImage.gz: $(obj)/vmlinux.bin.gz
$(obj)/uImage.lzma: $(obj)/vmlinux.bin.lzma $(obj)/uImage.lzma: $(obj)/vmlinux.bin.lzma
$(call if_changed,uimage,lzma) $(call if_changed,uimage,lzma)
$(obj)/uImage.bin: $(obj)/vmlinux.bin
$(call if_changed,uimage,none)
OBJCOPYFLAGS_vmlinux.srec := -I binary -O srec OBJCOPYFLAGS_vmlinux.srec := -I binary -O srec
$(obj)/vmlinux.srec: $(obj)/compressed/vmlinux $(obj)/vmlinux.srec: $(obj)/compressed/vmlinux
$(call if_changed,objcopy) $(call if_changed,objcopy)