Changeset 20628 for trunk


Ignore:
Timestamp:
2010-03-31T11:45:09+02:00 (7 years ago)
Author:
ralph
Message:

[uboot-lantiq] cleanup configuration handling

Location:
trunk/package/uboot-lantiq
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/uboot-lantiq/Config.in

    r20604 r20628  
    1 config UBOOT_CONFIG 
    2    string "configuration file" 
    3    default "easy50712_DDR166M" 
    4    help 
    5      The configuration reflects the settings for a dedicated board hardware. 
    6      Select for Danube evaluation board easy50712_DDR166M . 
    7      Select for AR9 evaluation board easy50812_DDR166M . 
    8  
    9 config UBOOT_DDR_CONFIG 
    10    string "DDR configuration file" 
    11    default "danube_ref_ddr166.conf" 
    12    depends on UBOOT_RAMBOOT 
    13    help 
    14      The DDR configuration file should reflect the DDR memory device configuration . 
    15      It will be used to create a RAM boot image 
    16      Select for Danube evalution board danube_ref_ddr166.conf . 
    17      Select for AR9 evalution board easy50812.conf . 
     1config UBOOT_TARGET 
     2        string "target" 
     3        default "easy50712_DDR166M" 
     4        depends on PACKAGE_uboot-lantiq 
     5        help 
     6          The configuration reflects the settings for a dedicated board hardware. 
     7          Select for Danube evaluation board easy50712_DDR166M . 
     8          Select for AR9 evaluation board easy50812_DDR166M . 
    189 
    1910config UBOOT_RAMBOOT 
    20    bool "Enable RAM boot image" 
    21    help 
    22      Using the UART boot mode of the ROM code this image could be loaded to the RAM. 
    23      Executing the image in the RAM the functionality of the uboot image can be  
    24      tested first without touching the original flash. 
    25      Note: Be carefull, by saving the environment the flash will be modified. 
    26      The OWRT flash layout differs from the layout provided by Lantiq / Infineon. 
     11        bool "Enable RAM boot image" 
     12        depends on PACKAGE_uboot-lantiq 
     13        help 
     14          Using the UART boot mode of the ROM code this image could be loaded to the RAM. 
     15          While executing the image in the RAM the functionality of the uboot image can be  
     16          tested first without touching the original flash. 
     17          Note: Be carefull, by saving the environment the flash will be modified. 
     18          The OWRT flash layout differs from the layout provided by Lantiq / Infineon. 
    2719 
    28 config IFXMIPS_UBOOT_A800 
     20config UBOOT_RAMBOOT_DDR_CONFIG 
     21        string "DDR configuration file" 
     22        default "easy50712_DDR166M.conf" 
     23        depends on UBOOT_RAMBOOT 
     24        help 
     25          The DDR configuration file should reflect the DDR memory device configuration . 
     26          It will be used to create a RAM boot image 
     27          Select for Danube evalution board easy50712_DDR166M.conf . 
     28          Select for AR9 evalution board easy50812.conf . 
     29 
     30 
     31config UBOOT_A800 
    2932        bool "add ARV452 Switch bringup hack" 
    30         depends on PACKAGE_uboot-ifxmips 
     33        depends on PACKAGE_uboot-lantiq 
    3134        help 
    3235          Say Y, if you have a arv452 board (wav-281, A800, ..) 
  • trunk/package/uboot-lantiq/Makefile

    r20610 r20628  
    2121include $(INCLUDE_DIR)/package.mk 
    2222 
     23ifeq ($(DUMP),) 
     24  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep '^CONFIG_UBOOT_' $(TOPDIR)/.config | md5s) 
     25endif 
     26 
    2327define Package/uboot-lantiq 
    2428  SECTION:=boot 
     
    3640endef 
    3741 
    38 UBOOT_CONFIG:=$(call qstrip,$(CONFIG_UBOOT_CONFIG)) 
    39 UBOOT_DDR_CONFIG:=$(call qstrip,$(CONFIG_UBOOT_DDR_CONFIG)) 
     42UBOOT_TARGET:=$(call qstrip,$(CONFIG_UBOOT_TARGET)) 
     43UBOOT_RAMBOOT_DDR_CONFIG:=$(call qstrip,$(CONFIG_UBOOT_RAMBOOT_DDR_CONFIG)) 
    4044 
    4145UBOOT_MAKE_OPTS:= \ 
     
    4549 
    4650define Package/uboot-lantiq/config 
    47         menu "configuration" 
    48                 source "$(SOURCE)/Config.in" 
    49         endmenu 
     51        source "$(SOURCE)/Config.in" 
    5052endef 
    5153 
     
    5860 
    5961define Build/Configure 
    60         $(call Build/Configure/Target,$(UBOOT_CONFIG)) 
     62        $(call Build/Configure/Target,$(UBOOT_TARGET)) 
    6163ifeq ($(CONFIG_UBOOT_RAMBOOT),y) 
    62         $(call Build/Configure/Target,$(UBOOT_CONFIG)_ramboot) 
     64        $(call Build/Configure/Target,$(UBOOT_TARGET)_ramboot) 
    6365endif 
    6466endef 
     
    7274 
    7375define Build/Compile 
    74         $(call Build/Compile/Target,$(UBOOT_CONFIG)) 
     76        $(call Build/Compile/Target,$(UBOOT_TARGET)) 
    7577ifeq ($(CONFIG_UBOOT_RAMBOOT),y) 
    76         $(call Build/Compile/Target,$(UBOOT_CONFIG)_ramboot) 
     78        $(call Build/Compile/Target,$(UBOOT_TARGET)_ramboot) 
    7779endif 
    7880endef 
    7981 
    8082define Package/uboot-lantiq/install 
    81         mkdir -p $(1)/$(UBOOT_CONFIG) 
     83        mkdir -p $(1)/$(UBOOT_TARGET) 
    8284        dd \ 
    83                 if=$(PKG_BUILD_DIR)/$(UBOOT_CONFIG)/u-boot.bin \ 
    84                 of=$(1)/$(UBOOT_CONFIG)/u-boot.bin \ 
     85                if=$(PKG_BUILD_DIR)/$(UBOOT_TARGET)/u-boot.bin \ 
     86                of=$(1)/$(UBOOT_TARGET)/u-boot.bin \ 
    8587                bs=64k conv=sync 
    8688ifeq ($(CONFIG_UBOOT_RAMBOOT),y) 
    87         if [ -e $(UBOOT_DDR_CONFIG) ]; then \ 
     89        if [ -e $(UBOOT_RAMBOOT_DDR_CONFIG) ]; then \ 
    8890                perl ./gct \ 
    89                         $(UBOOT_DDR_CONFIG) \ 
    90                         $(PKG_BUILD_DIR)/$(UBOOT_CONFIG)_ramboot/u-boot.srec \ 
    91                         $(1)/$(UBOOT_CONFIG)/u-boot.asc; \ 
     91                        $(UBOOT_RAMBOOT_DDR_CONFIG) \ 
     92                        $(PKG_BUILD_DIR)/$(UBOOT_TARGET)_ramboot/u-boot.srec \ 
     93                        $(1)/$(UBOOT_TARGET)/u-boot.asc; \ 
    9294        fi 
    9395endif 
Note: See TracChangeset for help on using the changeset viewer.