sibyte cleanups
SVN-Revision: 16470
This commit is contained in:
parent
956c268381
commit
1e470c10f3
7 changed files with 1150 additions and 10 deletions
|
@ -1,5 +1,4 @@
|
|||
# Copyright (C) 2006 OpenWrt.org
|
||||
# Copyright (C) 2006-2009 OpenWrt.org
|
||||
|
||||
::sysinit:/etc/init.d/rcS
|
||||
duart0::askfirst:/bin/ash --login
|
||||
#tts/1::askfirst:/bin/ash --login
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
CONFIG_HWMON=y
|
||||
CONFIG_SENSORS_LM90=y
|
||||
CONFIG_HWMON_DEBUG_CHIP=y
|
||||
# CONFIG_32BIT is not set
|
||||
CONFIG_64BIT=y
|
||||
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
|
||||
|
@ -164,7 +167,6 @@ CONFIG_PHYLIB=y
|
|||
# CONFIG_PROBE_INITRD_HEADER is not set
|
||||
# CONFIG_PROC_KCORE is not set
|
||||
CONFIG_RESOURCES_64BIT=y
|
||||
# CONFIG_RFKILL is not set
|
||||
# CONFIG_RIO is not set
|
||||
# CONFIG_RISCOM8 is not set
|
||||
CONFIG_RTC_CLASS=y
|
||||
|
@ -192,7 +194,6 @@ CONFIG_SIBYTE_BCM112X=y
|
|||
# CONFIG_SIBYTE_BUS_WATCHER is not set
|
||||
# CONFIG_SIBYTE_CARMEL is not set
|
||||
# CONFIG_SIBYTE_CFE_CONSOLE is not set
|
||||
CONFIG_SIBYTE_CFE=y
|
||||
# CONFIG_SIBYTE_CRHINE is not set
|
||||
# CONFIG_SIBYTE_CRHONE is not set
|
||||
# CONFIG_SIBYTE_DMA_PAGEOPS is not set
|
||||
|
@ -204,7 +205,6 @@ CONFIG_SIBYTE_SB1xxx_SOC=y
|
|||
# CONFIG_SIBYTE_SENTOSA is not set
|
||||
# CONFIG_SIBYTE_SWARM is not set
|
||||
# CONFIG_SIBYTE_TBPROF is not set
|
||||
# CONFIG_SIMULATION is not set
|
||||
# CONFIG_SOUND is not set
|
||||
# CONFIG_SPECIALIX is not set
|
||||
# CONFIG_STALDRV is not set
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
[PATCH] Remove SiByte simulator option
|
||||
|
||||
This patch removes the SiByte simulation Kconfig option, which only
|
||||
modified a printk.
|
||||
|
||||
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
||||
|
||||
--- a/arch/mips/sibyte/Kconfig
|
||||
+++ b/arch/mips/sibyte/Kconfig
|
||||
@@ -128,13 +128,6 @@ config SIBYTE_ENABLE_LDT_IF_PCI
|
||||
bool
|
||||
select SIBYTE_HAS_LDT if PCI
|
||||
|
||||
-config SIMULATION
|
||||
- bool "Running under simulation"
|
||||
- depends on SIBYTE_SB1xxx_SOC
|
||||
- help
|
||||
- Build a kernel suitable for running under the GDB simulator.
|
||||
- Primarily adjusts the kernel's notion of time.
|
||||
-
|
||||
config SB1_CEX_ALWAYS_FATAL
|
||||
bool "All cache exceptions considered fatal (no recovery attempted)"
|
||||
depends on SIBYTE_SB1xxx_SOC
|
||||
--- a/arch/mips/sibyte/swarm/setup.c
|
||||
+++ b/arch/mips/sibyte/swarm/setup.c
|
||||
@@ -137,11 +137,7 @@ void __init plat_mem_setup(void)
|
||||
swarm_rtc_type = RTC_M4LT81;
|
||||
|
||||
printk("This kernel optimized for "
|
||||
-#ifdef CONFIG_SIMULATION
|
||||
- "simulation"
|
||||
-#else
|
||||
"board"
|
||||
-#endif
|
||||
" runs "
|
||||
#ifdef CONFIG_SIBYTE_CFE
|
||||
"with"
|
File diff suppressed because it is too large
Load diff
|
@ -1,5 +1,10 @@
|
|||
--- a/arch/mips/sibyte/cfe/setup.c
|
||||
+++ b/arch/mips/sibyte/cfe/setup.c
|
||||
The SiByte platform code doesn't honor the CONFIG_CMDLINE kernel
|
||||
option. This patch fixes this issue.
|
||||
|
||||
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
||||
|
||||
--- a/arch/mips/sibyte/common/cfe.c
|
||||
+++ b/arch/mips/sibyte/common/cfe.c
|
||||
@@ -293,7 +293,11 @@ void __init prom_init(void)
|
||||
* It's OK for direct boot to not provide a
|
||||
* command line
|
||||
|
|
|
@ -526,6 +526,6 @@
|
|||
- if (m41t81_probe())
|
||||
- swarm_rtc_type = RTC_M4LT81;
|
||||
-
|
||||
printk("This kernel optimized for "
|
||||
#ifdef CONFIG_SIMULATION
|
||||
"simulation"
|
||||
#ifdef CONFIG_VT
|
||||
screen_info = (struct screen_info) {
|
||||
0, 0, /* orig-x, orig-y */
|
||||
|
|
23
target/linux/sibyte/patches/105-sibyte_hwmon.patch
Normal file
23
target/linux/sibyte/patches/105-sibyte_hwmon.patch
Normal file
|
@ -0,0 +1,23 @@
|
|||
--- a/arch/mips/sibyte/swarm/swarm-i2c.c
|
||||
+++ b/arch/mips/sibyte/swarm/swarm-i2c.c
|
||||
@@ -15,6 +15,11 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/kernel.h>
|
||||
|
||||
+static struct i2c_board_info swarm_i2c_info0[] __initdata = {
|
||||
+ {
|
||||
+ I2C_BOARD_INFO("lm90", 0x2a),
|
||||
+ },
|
||||
+};
|
||||
|
||||
static struct i2c_board_info swarm_i2c_info1[] __initdata = {
|
||||
{
|
||||
@@ -26,6 +31,8 @@ static int __init swarm_i2c_init(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
+ err = i2c_register_board_info(0, swarm_i2c_info0,
|
||||
+ ARRAY_SIZE(swarm_i2c_info0));
|
||||
err = i2c_register_board_info(1, swarm_i2c_info1,
|
||||
ARRAY_SIZE(swarm_i2c_info1));
|
||||
if (err < 0)
|
Loading…
Reference in a new issue