Skip to content

Commit 040d64d

Browse files
Magnus Dammhorms
authored andcommitted
ARM: shmobile: mackerel: Remove ZBOOT code
Remove ZBOOT support code for Mackerel. With this patch in place it is no longer possible to boot a self-contained kernel directly from the reset vector. ZBOOT is still supported on kzm9g. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
1 parent c517d83 commit 040d64d

File tree

4 files changed

+1
-140
lines changed

4 files changed

+1
-140
lines changed

arch/arm/mach-shmobile/include/mach/head-mackerel.txt

Lines changed: 0 additions & 93 deletions
This file was deleted.

arch/arm/mach-shmobile/include/mach/mmc-mackerel.h

Lines changed: 0 additions & 38 deletions
This file was deleted.

arch/arm/mach-shmobile/include/mach/mmc.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,5 @@
77
*
88
**************************************************/
99

10-
#ifdef CONFIG_MACH_MACKEREL
11-
#include "mach/mmc-mackerel.h"
12-
#else
1310
#error "unsupported board."
14-
#endif
15-
1611
#endif /* MMC_H */

arch/arm/mach-shmobile/include/mach/zboot.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
*
1010
**************************************************/
1111

12-
#ifdef CONFIG_MACH_MACKEREL
13-
#define MEMORY_START 0x40000000
14-
#include "mach/head-mackerel.txt"
15-
#elif defined(CONFIG_MACH_KZM9G) || defined(CONFIG_MACH_KZM9G_REFERENCE)
12+
#if defined(CONFIG_MACH_KZM9G) || defined(CONFIG_MACH_KZM9G_REFERENCE)
1613
#define MEMORY_START 0x43000000
1714
#include "mach/head-kzm9g.txt"
1815
#else

0 commit comments

Comments
 (0)