diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-08-17 12:44:30 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-08-17 12:44:30 +0000 |
| commit | c8d061c3cce88349a18b5070170c05a167465380 (patch) | |
| tree | f6a6d70ff6996a1d470fa21ad9bf955c95b95911 /linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107 | |
| parent | 10e66db03ddf82c79a57f0c2f381bc27db49e1e0 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2004/08/17 14:44:22+02:00 uni-frankfurt.de!mickey
- add variable for kernel console to kernel.oeclass: KERNEL_CONSOLE
- make Zaurus kernels (openzaurus-pxa and openzaurus-sa) use the new variable
- make it clear that the CONFIG_CMDLINE in defconfig-<machine> is irrelevant
BKrev: 4121fdaeah1NKmgjtU85X3JWOmq0Mw
Diffstat (limited to 'linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107')
4 files changed, 4 insertions, 4 deletions
diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi index 4ee819a154..67daba2c08 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi @@ -230,7 +230,7 @@ CONFIG_APM_CPU_IDLE=y CONFIG_APM_DISPLAY_BLANK=y CONFIG_APM_RTC_IS_GMT=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="console=null root=/dev/mtdblock2 mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home) jffs2_orphaned_inodes=delete" +CONFIG_CMDLINE="<see .oe file>" # CONFIG_SHARPSL_BOOTLDR_PARAMS is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_FREEPG_SIGNAL=y diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky index 9ee8cbff3d..25a87e771e 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-husky @@ -214,7 +214,7 @@ CONFIG_APM_CPU_IDLE=y CONFIG_APM_DISPLAY_BLANK=y CONFIG_APM_RTC_IS_GMT=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="console=null root=/dev/mtdblock2 mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) jffs2_orphaned_inodes=delete rootfstype=jffs2" +CONFIG_CMDLINE="<see .oe file>" # CONFIG_SHARPSL_BOOTLDR_PARAMS is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_FREEPG_SIGNAL=y diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle index 38fb1453a6..789aba23ab 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle @@ -213,7 +213,7 @@ CONFIG_APM_CPU_IDLE=y CONFIG_APM_DISPLAY_BLANK=y CONFIG_APM_RTC_IS_GMT=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="console=null root=/dev/mtdblock2 mtdparts=sharpsl-nand:7168k@0k(smf),22528k@7168k(root),-(home) jffs2_orphaned_inodes=delete" +CONFIG_CMDLINE="<see .oe file>" # CONFIG_SHARPSL_BOOTLDR_PARAMS is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_FREEPG_SIGNAL=y diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd index 712f344bc7..c40d7e6505 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-shepherd @@ -230,7 +230,7 @@ CONFIG_APM_CPU_IDLE=y CONFIG_APM_DISPLAY_BLANK=y CONFIG_APM_RTC_IS_GMT=y # CONFIG_ARTHUR is not set -CONFIG_CMDLINE="console=tty1 root=/dev/mtdblock2 mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home) jffs2_orphaned_inodes=delete rootfstype=jffs2 probe_io=0" +CONFIG_CMDLINE="<see .oe file>" # CONFIG_SHARPSL_BOOTLDR_PARAMS is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_FREEPG_SIGNAL=y |