Skip to content

Commit

Permalink
ARM: shmobile: mackerel: Remove ZBOOT code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Magnus Damm authored and Simon Horman committed Feb 23, 2015
1 parent c517d83 commit 040d64d
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 140 deletions.
93 changes: 0 additions & 93 deletions arch/arm/mach-shmobile/include/mach/head-mackerel.txt

This file was deleted.

38 changes: 0 additions & 38 deletions arch/arm/mach-shmobile/include/mach/mmc-mackerel.h

This file was deleted.

5 changes: 0 additions & 5 deletions arch/arm/mach-shmobile/include/mach/mmc.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,5 @@
*
**************************************************/

#ifdef CONFIG_MACH_MACKEREL
#include "mach/mmc-mackerel.h"
#else
#error "unsupported board."
#endif

#endif /* MMC_H */
5 changes: 1 addition & 4 deletions arch/arm/mach-shmobile/include/mach/zboot.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
*
**************************************************/

#ifdef CONFIG_MACH_MACKEREL
#define MEMORY_START 0x40000000
#include "mach/head-mackerel.txt"
#elif defined(CONFIG_MACH_KZM9G) || defined(CONFIG_MACH_KZM9G_REFERENCE)
#if defined(CONFIG_MACH_KZM9G) || defined(CONFIG_MACH_KZM9G_REFERENCE)
#define MEMORY_START 0x43000000
#include "mach/head-kzm9g.txt"
#else
Expand Down

0 comments on commit 040d64d

Please sign in to comment.