diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2014-04-07 07:05:00 -0400 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2014-04-07 07:45:21 -0400 |
| commit | c24cf712ac53ae8a7bedceb1c967da1667431d8e (patch) | |
| tree | a2f148f99936397d8b5edf75af99e89c681ee14c /arch/microblaze | |
| parent | ed85ed697d8d66f4b3284d7a8a3dc7002c966178 (diff) | |
microblaze: Remove platform folder
There is no reason to use platform folder structure now.
Everything is OF driven.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/Kconfig | 2 | ||||
| -rw-r--r-- | arch/microblaze/Kconfig.platform (renamed from arch/microblaze/platform/Kconfig.platform) | 0 | ||||
| -rw-r--r-- | arch/microblaze/Makefile | 1 | ||||
| -rw-r--r-- | arch/microblaze/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/microblaze/kernel/platform.c (renamed from arch/microblaze/platform/platform.c) | 0 | ||||
| -rw-r--r-- | arch/microblaze/platform/Makefile | 5 |
6 files changed, 2 insertions, 8 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index dc51ec80cf1a..9ae08541e30d 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig | |||
| @@ -74,7 +74,7 @@ source "init/Kconfig" | |||
| 74 | 74 | ||
| 75 | source "kernel/Kconfig.freezer" | 75 | source "kernel/Kconfig.freezer" |
| 76 | 76 | ||
| 77 | source "arch/microblaze/platform/Kconfig.platform" | 77 | source "arch/microblaze/Kconfig.platform" |
| 78 | 78 | ||
| 79 | menu "Processor type and features" | 79 | menu "Processor type and features" |
| 80 | 80 | ||
diff --git a/arch/microblaze/platform/Kconfig.platform b/arch/microblaze/Kconfig.platform index 1b3d8c849101..1b3d8c849101 100644 --- a/arch/microblaze/platform/Kconfig.platform +++ b/arch/microblaze/Kconfig.platform | |||
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index a69eaf2ab130..740f2b82a182 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile | |||
| @@ -48,7 +48,6 @@ head-y := arch/microblaze/kernel/head.o | |||
| 48 | libs-y += arch/microblaze/lib/ | 48 | libs-y += arch/microblaze/lib/ |
| 49 | core-y += arch/microblaze/kernel/ | 49 | core-y += arch/microblaze/kernel/ |
| 50 | core-y += arch/microblaze/mm/ | 50 | core-y += arch/microblaze/mm/ |
| 51 | core-y += arch/microblaze/platform/ | ||
| 52 | core-$(CONFIG_PCI) += arch/microblaze/pci/ | 51 | core-$(CONFIG_PCI) += arch/microblaze/pci/ |
| 53 | 52 | ||
| 54 | drivers-$(CONFIG_OPROFILE) += arch/microblaze/oprofile/ | 53 | drivers-$(CONFIG_OPROFILE) += arch/microblaze/oprofile/ |
diff --git a/arch/microblaze/kernel/Makefile b/arch/microblaze/kernel/Makefile index 5b0e512c78e5..08d50cc55e7d 100644 --- a/arch/microblaze/kernel/Makefile +++ b/arch/microblaze/kernel/Makefile | |||
| @@ -16,7 +16,7 @@ extra-y := head.o vmlinux.lds | |||
| 16 | 16 | ||
| 17 | obj-y += dma.o exceptions.o \ | 17 | obj-y += dma.o exceptions.o \ |
| 18 | hw_exception_handler.o intc.o irq.o \ | 18 | hw_exception_handler.o intc.o irq.o \ |
| 19 | process.o prom.o prom_parse.o ptrace.o \ | 19 | platform.o process.o prom.o prom_parse.o ptrace.o \ |
| 20 | reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o | 20 | reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o |
| 21 | 21 | ||
| 22 | obj-y += cpu/ | 22 | obj-y += cpu/ |
diff --git a/arch/microblaze/platform/platform.c b/arch/microblaze/kernel/platform.c index b9529caa507a..b9529caa507a 100644 --- a/arch/microblaze/platform/platform.c +++ b/arch/microblaze/kernel/platform.c | |||
diff --git a/arch/microblaze/platform/Makefile b/arch/microblaze/platform/Makefile deleted file mode 100644 index 5bcb631b80b6..000000000000 --- a/arch/microblaze/platform/Makefile +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Makefile for arch/microblaze/platform directory | ||
| 3 | # | ||
| 4 | |||
| 5 | obj-y += platform.o | ||