diff options
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 11 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile.boot | 1 |
4 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 35c146f31e46..4ede75e67afe 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
| @@ -306,7 +306,6 @@ dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \ | |||
| 306 | s3c6410-smdk6410.dtb | 306 | s3c6410-smdk6410.dtb |
| 307 | dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ | 307 | dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ |
| 308 | r7s72100-genmai.dtb \ | 308 | r7s72100-genmai.dtb \ |
| 309 | r7s72100-genmai-reference.dtb \ | ||
| 310 | r8a7740-armadillo800eva.dtb \ | 309 | r8a7740-armadillo800eva.dtb \ |
| 311 | r8a7778-bockw.dtb \ | 310 | r8a7778-bockw.dtb \ |
| 312 | r8a7778-bockw-reference.dtb \ | 311 | r8a7778-bockw-reference.dtb \ |
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 0f92ba8e7884..2ba18c6b71c2 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
| @@ -240,17 +240,6 @@ config MACH_GENMAI | |||
| 240 | depends on ARCH_R7S72100 | 240 | depends on ARCH_R7S72100 |
| 241 | select USE_OF | 241 | select USE_OF |
| 242 | 242 | ||
| 243 | config MACH_GENMAI_REFERENCE | ||
| 244 | bool "Genmai board - Reference Device Tree Implementation" | ||
| 245 | depends on ARCH_R7S72100 | ||
| 246 | select USE_OF | ||
| 247 | ---help--- | ||
| 248 | Use reference implementation of Genmai board support | ||
| 249 | which makes use of device tree at the expense | ||
| 250 | of not supporting a number of devices. | ||
| 251 | |||
| 252 | This is intended to aid developers | ||
| 253 | |||
| 254 | config MACH_MARZEN | 243 | config MACH_MARZEN |
| 255 | bool "MARZEN board" | 244 | bool "MARZEN board" |
| 256 | depends on ARCH_R8A7779 | 245 | depends on ARCH_R8A7779 |
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index c12a1c50e9d2..a455584b000f 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile | |||
| @@ -67,7 +67,6 @@ obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o | |||
| 67 | obj-$(CONFIG_MACH_BOCKW) += board-bockw.o | 67 | obj-$(CONFIG_MACH_BOCKW) += board-bockw.o |
| 68 | obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o | 68 | obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o |
| 69 | obj-$(CONFIG_MACH_GENMAI) += board-genmai.o | 69 | obj-$(CONFIG_MACH_GENMAI) += board-genmai.o |
| 70 | obj-$(CONFIG_MACH_GENMAI_REFERENCE) += board-genmai-reference.o | ||
| 71 | obj-$(CONFIG_MACH_MARZEN) += board-marzen.o | 70 | obj-$(CONFIG_MACH_MARZEN) += board-marzen.o |
| 72 | obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o | 71 | obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o |
| 73 | obj-$(CONFIG_MACH_LAGER) += board-lager.o | 72 | obj-$(CONFIG_MACH_LAGER) += board-lager.o |
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot index 99455ecafa05..918fccffa1b6 100644 --- a/arch/arm/mach-shmobile/Makefile.boot +++ b/arch/arm/mach-shmobile/Makefile.boot | |||
| @@ -7,7 +7,6 @@ loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000 | |||
| 7 | loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 | 7 | loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 |
| 8 | loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 | 8 | loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 |
| 9 | loadaddr-$(CONFIG_MACH_GENMAI) += 0x08008000 | 9 | loadaddr-$(CONFIG_MACH_GENMAI) += 0x08008000 |
| 10 | loadaddr-$(CONFIG_MACH_GENMAI_REFERENCE) += 0x08008000 | ||
| 11 | loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000 | 10 | loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000 |
| 12 | loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 | 11 | loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 |
| 13 | loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 | 12 | loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 |
