aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2011-01-10 22:01:08 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-25 10:06:52 -0500
commitf45b1149911cc4c3ab50e56c8844ad4ec04a4575 (patch)
treeb7567322fae765fcc9b24f3ec1604b13c21a5c34 /arch/arm/Kconfig
parent1bae4ce27c9c90344f23c65ea6966c50ffeae2f5 (diff)
ARM: 6617/1: mmc, Add zboot from MMC support for SuperH Mobile ARM
This allows a ROM-able zImage to be written to MMC and for SuperH Mobile ARM to boot directly from the MMCIF hardware block. This is achieved by the MaskROM loading the first portion of the image into MERAM and then jumping to it. This portion contains loader code which copies the entire image to SDRAM and jumps to it. From there the zImage boot code proceeds as normal, uncompressing the image into its final location and then jumping to it. Cc: Magnus Damm <magnus.damm@gmail.com> Russell, please consider merging this for 2.6.38. This patch depends on: * "mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h" which will be merged though Paul Mundt's rmobile sh-2.6. The absence of this patch will break the build if the (new) CONFIG_ZBOOT_ROM_MMCIF option is set. There are no subtle side-effects. v2: Addressed comments by Magnus Damm * Fix copyright in vrl4.c * Fix use of #define CONFIG_ZBOOT_ROM_MMCIF in mmcif-sh7372.c * Initialise LED GPIO lines in head-ap4evb.txt instead of mmcif-sh7372.c as this is considered board-specific. v3: Addressed comments made in person by Magnus Damm * Move mmcif_loader to be earlier in the image and reduce the number of blocks of boot program loaded by the MaskRom from 40 to 8 accordingly. * Move LED GPIO initialisation into mmcif_progress_init - This leaves the partner jet script unbloated Other * inline mmcif_update_progress so it is a static inline in a header file v4: * Use htole16() and htole32() in v4rl.c to ensure that the output is little endian v5: Addressed comments by Russell King * Simplify assembly code * Jump to code rather than an address <- bug fix * Use (void __iomem *) as appropriate Roll in mackerel support * This was previously a separate patch, only because of the order in which this code was developed Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5cff165b7eb0..2d0a1dc15994 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1619,6 +1619,18 @@ config ZBOOT_ROM
1619 Say Y here if you intend to execute your compressed kernel image 1619 Say Y here if you intend to execute your compressed kernel image
1620 (zImage) directly from ROM or flash. If unsure, say N. 1620 (zImage) directly from ROM or flash. If unsure, say N.
1621 1621
1622config ZBOOT_ROM_MMCIF
1623 bool "Include MMCIF loader in zImage (EXPERIMENTAL)"
1624 depends on ZBOOT_ROM && ARCH_SH7372 && EXPERIMENTAL
1625 help
1626 Say Y here to include experimental MMCIF loading code in the
1627 ROM-able zImage. With this enabled it is possible to write the
1628 the ROM-able zImage kernel image to an MMC card and boot the
1629 kernel straight from the reset vector. At reset the processor
1630 Mask ROM will load the first part of the the ROM-able zImage
1631 which in turn loads the rest the kernel image to RAM using the
1632 MMCIF hardware block.
1633
1622config CMDLINE 1634config CMDLINE
1623 string "Default kernel command string" 1635 string "Default kernel command string"
1624 default "" 1636 default ""