From 421102e775e8822f0c48f730dff86efc8cd20ce8 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 21 Sep 2012 15:21:02 -0400 Subject: [PATCH] rpi: updated firmware and patchset. --- .../kernel/kernel.config.armv5tel-ipfire-rpi | 36 +++++++++++++++---- config/rootfiles/common/armv5tel/rpi-firmware | 1 + config/rpi-firmware/config.txt | 28 +++++++++++++++ lfs/linux | 5 ++- lfs/rpi-firmware | 5 +-- 5 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 config/rpi-firmware/config.txt diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi index 45bd74212..c2445ad34 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-rpi +++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.2.28 Kernel Configuration +# Linux/arm 3.2.30 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -17,10 +17,12 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_ARCH_HAS_CPUFREQ=y CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_FIQ=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_NEED_MACH_MEMORY_H=y @@ -371,6 +373,29 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y # # CPU Power Management # + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_STAT=m +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# ARM CPU frequency scaling drivers +# +CONFIG_ARM_BCM2835_CPUFREQ=y CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y @@ -1469,9 +1494,6 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set -CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -CONFIG_RTL8192C_COMMON=m CONFIG_WL1251=m # CONFIG_WL1251_SPI is not set CONFIG_WL1251_SDIO=m @@ -1485,6 +1507,7 @@ CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m +CONFIG_RTL8192CU=m # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -1777,7 +1800,7 @@ CONFIG_W1_SLAVE_DS2760=m CONFIG_W1_SLAVE_DS2780=m CONFIG_W1_SLAVE_BQ27000=m # CONFIG_POWER_SUPPLY is not set -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -1885,8 +1908,9 @@ CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m -CONFIG_THERMAL=m +CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_BCM2835=y CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_CORE is not set # CONFIG_WATCHDOG_NOWAYOUT is not set diff --git a/config/rootfiles/common/armv5tel/rpi-firmware b/config/rootfiles/common/armv5tel/rpi-firmware index 4d5d27006..4b6d1281a 100644 --- a/config/rootfiles/common/armv5tel/rpi-firmware +++ b/config/rootfiles/common/armv5tel/rpi-firmware @@ -5,6 +5,7 @@ boot/arm224_start.elf boot/arm240_start.elf boot/bootcode.bin boot/cmdline.txt +boot/config.txt #boot/first32k.bin boot/loader.bin boot/start.elf diff --git a/config/rpi-firmware/config.txt b/config/rpi-firmware/config.txt new file mode 100644 index 000000000..e9bd9bf5e --- /dev/null +++ b/config/rpi-firmware/config.txt @@ -0,0 +1,28 @@ +############################################################################### +# +# Raspberry Pi - Videocore configuration file +# +############################################################################### + +############################################################################### +# +# Turbo Mode (cpufreq) Settings ... +# default clocks are arm=700, core=250 and sdram=400 +# +############################################################################### +# +# underclock at idle +arm_freq_min=500 +sdram_freq_min=250 +# +# use following paramters to overclock at load +#arm_freq=1000 +#core_freq=450 +#sdram_freq=450 +#over_voltage=2 + +################################################################################ +# +# end +# +################################################################################ diff --git a/lfs/linux b/lfs/linux index c06fc4991..b481e65b5 100644 --- a/lfs/linux +++ b/lfs/linux @@ -26,7 +26,7 @@ include Config VER = 3.2.30 -RPI_PATCHES = linux-3.2.27-091073b +RPI_PATCHES = linux-3.2.27-807223a THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.bz2 @@ -76,7 +76,7 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz $(DL_FILE)_MD5 = d899e65520424a27661009ea43b28103 -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 9daec752fba403a488818df6dd57a714 +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = b072ccb2534ff910fd5867fc0da1b24a install : $(TARGET) @@ -146,7 +146,6 @@ endif ifeq "$(KCFG)" "-rpi" # Apply Raspberry Pi kernel patches. cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1 - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch endif ifeq "$(HEADERS)" "1" diff --git a/lfs/rpi-firmware b/lfs/rpi-firmware index b2afde251..2143d2395 100644 --- a/lfs/rpi-firmware +++ b/lfs/rpi-firmware @@ -24,7 +24,7 @@ include Config -VER = b2200cd +VER = 9f7cff0 THISAPP = rpi-firmware-$(VER) DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d4b0a5b5fe8cdbe5df17aadd5ec60ff0 +$(DL_FILE)_MD5 = 4de4db529fc2c0000d381d016675e115 install : $(TARGET) @@ -70,4 +70,5 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @cd / && tar axf $(DIR_DL)/$(DL_FILE) + cp $(DIR_SRC)/config/rpi-firmware/config.txt /boot @$(POSTBUILD) -- 2.39.2