tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'sh/stable-updates'
+20
-15
+1
-1
arch/sh/Makefile
+1
-1
arch/sh/Makefile
···
199
199
libs-$(CONFIG_SUPERH32) := arch/sh/lib/ $(libs-y)
200
200
libs-$(CONFIG_SUPERH64) := arch/sh/lib64/ $(libs-y)
201
201
202
-
BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec \
202
+
BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec uImage.bin \
203
203
zImage vmlinux.srec romImage
204
204
PHONY += maketools $(BOOT_TARGETS) FORCE
205
205
-4
arch/sh/boards/mach-rsk/devices-rsk7203.c
-4
arch/sh/boards/mach-rsk/devices-rsk7203.c
···
11
11
#include <linux/types.h>
12
12
#include <linux/platform_device.h>
13
13
#include <linux/interrupt.h>
14
-
#include <linux/mtd/mtd.h>
15
-
#include <linux/mtd/partitions.h>
16
-
#include <linux/mtd/physmap.h>
17
-
#include <linux/mtd/map.h>
18
14
#include <linux/smsc911x.h>
19
15
#include <linux/gpio.h>
20
16
#include <linux/leds.h>
+14
-9
arch/sh/boards/mach-rsk/setup.c
+14
-9
arch/sh/boards/mach-rsk/setup.c
···
15
15
#include <linux/mtd/mtd.h>
16
16
#include <linux/mtd/partitions.h>
17
17
#include <linux/mtd/physmap.h>
18
+
#ifdef CONFIG_MTD
18
19
#include <linux/mtd/map.h>
20
+
#endif
19
21
#include <asm/machvec.h>
20
22
#include <asm/io.h>
21
-
22
-
static const char *probes[] = { "cmdlinepart", NULL };
23
-
24
-
static struct mtd_partition *parsed_partitions;
25
23
26
24
static struct mtd_partition rsk_partitions[] = {
27
25
{
···
39
41
};
40
42
41
43
static struct physmap_flash_data flash_data = {
44
+
.parts = rsk_partitions,
45
+
.nr_parts = ARRAY_SIZE(rsk_partitions),
42
46
.width = 2,
43
47
};
44
48
···
60
60
},
61
61
};
62
62
63
-
static struct mtd_info *flash_mtd;
63
+
#ifdef CONFIG_MTD
64
+
static const char *probes[] = { "cmdlinepart", NULL };
64
65
65
66
static struct map_info rsk_flash_map = {
66
67
.name = "RSK+ Flash",
67
68
.size = 0x400000,
68
69
.bankwidth = 2,
69
70
};
71
+
72
+
static struct mtd_info *flash_mtd;
73
+
74
+
static struct mtd_partition *parsed_partitions;
70
75
71
76
static void __init set_mtd_partitions(void)
72
77
{
···
82
77
nr_parts = parse_mtd_partitions(flash_mtd, probes,
83
78
&parsed_partitions, 0);
84
79
/* If there is no partition table, used the hard coded table */
85
-
if (nr_parts <= 0) {
86
-
flash_data.parts = rsk_partitions;
87
-
flash_data.nr_parts = ARRAY_SIZE(rsk_partitions);
88
-
} else {
80
+
if (nr_parts > 0) {
89
81
flash_data.nr_parts = nr_parts;
90
82
flash_data.parts = parsed_partitions;
91
83
}
92
84
}
85
+
#else
86
+
static inline void set_mtd_partitions(void) {}
87
+
#endif
93
88
94
89
static struct platform_device *rsk_devices[] __initdata = {
95
90
&flash_device,
+5
-1
arch/sh/boot/Makefile
+5
-1
arch/sh/boot/Makefile
···
20
20
CONFIG_ZERO_PAGE_OFFSET ?= 0x00001000
21
21
CONFIG_ENTRY_OFFSET ?= 0x00001000
22
22
23
+
suffix-y := bin
23
24
suffix-$(CONFIG_KERNEL_GZIP) := gz
24
25
suffix-$(CONFIG_KERNEL_BZIP2) := bz2
25
26
suffix-$(CONFIG_KERNEL_LZMA) := lzma
26
27
27
-
targets := zImage vmlinux.srec romImage uImage uImage.srec uImage.gz uImage.bz2 uImage.lzma
28
+
targets := zImage vmlinux.srec romImage uImage uImage.srec uImage.gz uImage.bz2 uImage.lzma uImage.bin
28
29
extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma
29
30
subdir- := compressed romimage
30
31
···
88
87
89
88
$(obj)/uImage.lzma: $(obj)/vmlinux.bin.lzma
90
89
$(call if_changed,uimage,lzma)
90
+
91
+
$(obj)/uImage.bin: $(obj)/vmlinux.bin
92
+
$(call if_changed,uimage,none)
91
93
92
94
OBJCOPYFLAGS_vmlinux.srec := -I binary -O srec
93
95
$(obj)/vmlinux.srec: $(obj)/compressed/vmlinux