Commit 4c353448 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] sh: update defconfigs

From: Paul Mundt <lethal@linux-sh.org>

This patch updates the sh defconfigs to use the board_defconfig format
instead of the defconfig-board format that sh was using before.  Since Sam
Ravnborg already added the automated archhelp stuff that sh was using to the
top-level Makefile, the sh version can be killed off.
parent ffbf68f3
......@@ -288,22 +288,22 @@ for reference instead of trying to guess what settings are supposed to be
used on it.
Also, as soon as you have copied over a sample .config for your new board
(assume arch/sh/configs/defconfig-vapor), you can also use this directly as a
(assume arch/sh/configs/vapor_defconfig), you can also use this directly as a
build target, and it will be implicitly listed as such in the help text.
Looking at the 'make help' output, you should now see something like:
Architecture specific targets (sh):
zImage - Compressed kernel image (arch/sh/boot/zImage)
defconfig-adx - Build for adx
defconfig-cqreek - Build for cqreek
defconfig-dreamcast - Build for dreamcast
adx_defconfig - Build for adx
cqreek_defconfig - Build for cqreek
dreamcast_defconfig - Build for dreamcast
...
defconfig-vapor - Build for vapor
vapor_defconfig - Build for vapor
which then allows you to do:
$ make ARCH=sh CROSS_COMPILE=sh4-linux- defconfig-vapor vmlinux
$ make ARCH=sh CROSS_COMPILE=sh4-linux- vapor_defconfig vmlinux
which will in turn copy the defconfig for this board, run it through
oldconfig (prompting you for any new options since the time of creation),
......
# $Id: Makefile,v 1.32 2003/10/26 23:33:49 lethal Exp $
# $Id: Makefile,v 1.34 2004/03/21 17:31:06 lethal Exp $
#
# This file is subject to the terms and conditions of the GNU General Public
# License. See the file "COPYING" in the main directory of this archive
......@@ -35,7 +35,6 @@ cflags-$(CONFIG_CPU_SH4) += -m4 \
cflags-$(CONFIG_SH_DSP) += -Wa,-dsp
cflags-$(CONFIG_SH_KGDB) += -g
cflags-$(CONFIG_EMBEDDED) += -Os
cflags-$(CONFIG_MORE_COMPILE_OPTIONS) += \
$(shell echo $(CONFIG_COMPILE_OPTIONS) | sed -e 's/"//g')
......@@ -134,19 +133,7 @@ compressed: zImage
archclean:
$(Q)$(MAKE) $(clean)=$(boot)
defconfig-%:
@echo ' Copying arch/sh/configs/$@ -> .config'
@if [ -e .config ]; then mv -f .config .config.old; fi
@cp -f arch/sh/configs/$@ .config
@chmod 644 .config
define archhelp
@echo ' zImage - Compressed kernel image (arch/sh/boot/zImage)'
for board in arch/sh/configs/*; \
do \
echo -n ' ' $$board | sed -e 's|arch/sh/configs/||g' ; \
echo -n ' - Build for ' ; \
echo -e $$board | sed -e 's|.*-||g'; \
done
endef
......@@ -92,10 +92,11 @@ CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_SH_PCLK_FREQ=1193182
# CONFIG_CPU_FREQ is not set
# CONFIG_SH_DMA is not set
CONFIG_HD6446X_SERIES=y
CONFIG_HD64461=y
# CONFIG_HD64465 is not set
CONFIG_HD64461_IRQ=36
CONFIG_HD64461_ENABLER=y
# CONFIG_HD64461_ENABLER is not set
#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
......@@ -155,6 +156,7 @@ CONFIG_BLK_DEV_IDEDISK=y
#
# IDE chipset support/bugfixes
#
CONFIG_IDE_GENERIC=y
# CONFIG_BLK_DEV_IDEDMA is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_DMA_NONPCI is not set
......@@ -236,12 +238,9 @@ CONFIG_SERIO=y
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
# CONFIG_SERIAL is not set
CONFIG_SH_SCI=y
# CONFIG_SERIAL_CONSOLE is not set
#
# Unix 98 PTY support
# Unix98 PTY support
#
# CONFIG_UNIX98_PTYS is not set
# CONFIG_PSMOUSE is not set
......@@ -267,19 +266,6 @@ CONFIG_SH_SCI=y
#
# CONFIG_I2C is not set
#
# I2C Algorithms
#
#
# I2C Hardware Bus support
#
#
# I2C Hardware Sensors Chip support
#
# CONFIG_I2C_SENSOR is not set
#
# File systems
#
......@@ -396,6 +382,10 @@ CONFIG_FONT_PEARL_8x8=y
#
# USB support
#
#
# USB Gadget Support
#
# CONFIG_USB_GADGET is not set
#
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment