hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup configuration handling 

SVN-Revision: 20628
owl
Ralph Hempel 2010-03-31 09:45:09 +00:00
parent a423c3abee
commit a09006c414
2 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
package/uboot-lantiq/Config.in
View File

@ -1,32 +1,35 @@
config UBOOT_CONFIG config UBOOT_TARGET
string "configuration file" string "target"
default "easy50712_DDR166M" default "easy50712_DDR166M"
depends on PACKAGE_uboot-lantiq
help help
The configuration reflects the settings for a dedicated board hardware. The configuration reflects the settings for a dedicated board hardware.
Select for Danube evaluation board easy50712_DDR166M . Select for Danube evaluation board easy50712_DDR166M .
Select for AR9 evaluation board easy50812_DDR166M . Select for AR9 evaluation board easy50812_DDR166M .
config UBOOT_DDR_CONFIG
string "DDR configuration file"
default "danube_ref_ddr166.conf"
depends on UBOOT_RAMBOOT
help
The DDR configuration file should reflect the DDR memory device configuration .
It will be used to create a RAM boot image
Select for Danube evalution board danube_ref_ddr166.conf .
Select for AR9 evalution board easy50812.conf .
config UBOOT_RAMBOOT config UBOOT_RAMBOOT
bool "Enable RAM boot image" bool "Enable RAM boot image"
depends on PACKAGE_uboot-lantiq
help help
Using the UART boot mode of the ROM code this image could be loaded to the RAM. Using the UART boot mode of the ROM code this image could be loaded to the RAM.
Executing the image in the RAM the functionality of the uboot image can be While executing the image in the RAM the functionality of the uboot image can be
tested first without touching the original flash. tested first without touching the original flash.
Note: Be carefull, by saving the environment the flash will be modified. Note: Be carefull, by saving the environment the flash will be modified.
The OWRT flash layout differs from the layout provided by Lantiq / Infineon. The OWRT flash layout differs from the layout provided by Lantiq / Infineon.
config IFXMIPS_UBOOT_A800 config UBOOT_RAMBOOT_DDR_CONFIG
string "DDR configuration file"
default "easy50712_DDR166M.conf"
depends on UBOOT_RAMBOOT
help
The DDR configuration file should reflect the DDR memory device configuration .
It will be used to create a RAM boot image
Select for Danube evalution board easy50712_DDR166M.conf .
Select for AR9 evalution board easy50812.conf .
config UBOOT_A800
bool "add ARV452 Switch bringup hack" bool "add ARV452 Switch bringup hack"
depends on PACKAGE_uboot-ifxmips depends on PACKAGE_uboot-lantiq
help help
Say Y, if you have a arv452 board (wav-281, A800, ..) Say Y, if you have a arv452 board (wav-281, A800, ..)

32
package/uboot-lantiq/Makefile
View File

@ -20,6 +20,10 @@ PKG_TARGETS:=bin
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
ifeq ($(DUMP),)
STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep '^CONFIG_UBOOT_' $(TOPDIR)/.config | md5s)
endif
define Package/uboot-lantiq define Package/uboot-lantiq
SECTION:=boot SECTION:=boot
CATEGORY:=Boot Loaders CATEGORY:=Boot Loaders
@ -35,8 +39,8 @@ define Build/Prepare
find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf
endef endef
UBOOT_CONFIG:=$(call qstrip,$(CONFIG_UBOOT_CONFIG)) UBOOT_TARGET:=$(call qstrip,$(CONFIG_UBOOT_TARGET))
UBOOT_DDR_CONFIG:=$(call qstrip,$(CONFIG_UBOOT_DDR_CONFIG)) UBOOT_RAMBOOT_DDR_CONFIG:=$(call qstrip,$(CONFIG_UBOOT_RAMBOOT_DDR_CONFIG))
UBOOT_MAKE_OPTS:= \ UBOOT_MAKE_OPTS:= \
CROSS_COMPILE=$(TARGET_CROSS) \ CROSS_COMPILE=$(TARGET_CROSS) \
@ -44,9 +48,7 @@ UBOOT_MAKE_OPTS:= \
V=1 V=1
define Package/uboot-lantiq/config define Package/uboot-lantiq/config
menu "configuration"
source "$(SOURCE)/Config.in" source "$(SOURCE)/Config.in"
endmenu
endef endef
define Build/Configure/Target define Build/Configure/Target
@ -57,9 +59,9 @@ define Build/Configure/Target
endef endef
define Build/Configure define Build/Configure
$(call Build/Configure/Target,$(UBOOT_CONFIG)) $(call Build/Configure/Target,$(UBOOT_TARGET))
ifeq ($(CONFIG_UBOOT_RAMBOOT),y) ifeq ($(CONFIG_UBOOT_RAMBOOT),y)
$(call Build/Configure/Target,$(UBOOT_CONFIG)_ramboot) $(call Build/Configure/Target,$(UBOOT_TARGET)_ramboot)
endif endif
endef endef
@ -71,24 +73,24 @@ define Build/Compile/Target
endef endef
define Build/Compile define Build/Compile
$(call Build/Compile/Target,$(UBOOT_CONFIG)) $(call Build/Compile/Target,$(UBOOT_TARGET))
ifeq ($(CONFIG_UBOOT_RAMBOOT),y) ifeq ($(CONFIG_UBOOT_RAMBOOT),y)
$(call Build/Compile/Target,$(UBOOT_CONFIG)_ramboot) $(call Build/Compile/Target,$(UBOOT_TARGET)_ramboot)
endif endif
endef endef
define Package/uboot-lantiq/install define Package/uboot-lantiq/install
mkdir -p $(1)/$(UBOOT_CONFIG) mkdir -p $(1)/$(UBOOT_TARGET)
dd \ dd \
if=$(PKG_BUILD_DIR)/$(UBOOT_CONFIG)/u-boot.bin \ if=$(PKG_BUILD_DIR)/$(UBOOT_TARGET)/u-boot.bin \
of=$(1)/$(UBOOT_CONFIG)/u-boot.bin \ of=$(1)/$(UBOOT_TARGET)/u-boot.bin \
bs=64k conv=sync bs=64k conv=sync
ifeq ($(CONFIG_UBOOT_RAMBOOT),y) ifeq ($(CONFIG_UBOOT_RAMBOOT),y)
if [ -e $(UBOOT_DDR_CONFIG) ]; then \ if [ -e $(UBOOT_RAMBOOT_DDR_CONFIG) ]; then \
perl ./gct \ perl ./gct \
$(UBOOT_DDR_CONFIG) \ $(UBOOT_RAMBOOT_DDR_CONFIG) \
$(PKG_BUILD_DIR)/$(UBOOT_CONFIG)_ramboot/u-boot.srec \ $(PKG_BUILD_DIR)/$(UBOOT_TARGET)_ramboot/u-boot.srec \
$(1)/$(UBOOT_CONFIG)/u-boot.asc; \ $(1)/$(UBOOT_TARGET)/u-boot.asc; \
fi fi
endif endif
endef endef