Changeset 238

Show
Ignore:
Timestamp:
09/29/08 19:40:48 (2 months ago)
Author:
jcrouse
Message:

buildrom: Add Serengeti-Cheetah to the V3 family

Signed-off-by: Jordan Crouse <jordan.crouse@…>
Acked-by: Ronald G. Minnich <rminnich@…>

Location:
buildrom-devel
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • buildrom-devel/config/platforms/Config.in

    r236 r238  
    148148       bool "AMD Serengeti-Cheetah" 
    149149       depends on VENDOR_AMD 
    150        depends on COREBOOT_V2 
    151150       select PLATFORM 
    152151       select PLATFORM_SUPPORT_64BIT 
    … …  
    210209        bool "Build for the AMD SimNow (TM) emulator" 
    211210        depends on PLATFORM_SERENGETI_CHEETAH || PLATFORM_SERENGETI_CHEETAH_64 
     211        depends on COREBOOT_V2 
    212212        default n 
    213213        help 

  • buildrom-devel/config/platforms/serengeti_cheetah.conf

    r226 r238  
    3535 
    3636COREBOOT_VENDOR=amd 
    37  
    38 CBV3_TAG=HEAD 
     37CBV3_TAG=875 
    3938 
    4039ifeq ($(CONFIG_PLATFORM_CHEETAH_FAM10),y) 
    … …  
    4645CBV2_TDIR=serengeti_cheetah 
    4746CBV2_TAG=3343 
     47 
     48# cb-v3 has a different board name 
     49CBV3_BOARD=serengeti 
    4850endif 

  • buildrom-devel/packages/coreboot-v3/coreboot-v3.mk

    r196 r238  
    3232endif 
    3333 
    34 TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom 
     34# Set the cb-v3 board name to the default if not otherwise 
     35# specified 
     36 
     37CBV3_BOARD ?= $(COREBOOOT_BOARD) 
     38 
     39TARGET_ROM = $(COREBOOT_VENDOR)-$(CBV3_BOARD).rom 
    3540 
    3641CBV3_OUTPUT=$(CBV3_SRC_DIR)/build/coreboot.rom 
    … …  
    5863$(CBV3_STAMP_DIR)/.configured: $(CBV3_STAMP_DIR)/.patched 
    5964        @ echo "Configuring coreboot v3..." 
    60 ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) 
    61         @ cp -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) $(CBV3_SRC_DIR)/.config 
    62         @ echo "Using custom config $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)" 
     65ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD) ]; then echo 1; fi),1) 
     66        @ cp -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD) $(CBV3_SRC_DIR)/.config 
     67        @ echo "Using custom config $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD)" 
    6368        @ make -C $(CBV3_SRC_DIR) oldconfig > $(CBV3_CONFIG_LOG) 2>&1 
    6469else 
    6570        @ make -C $(CBV3_SRC_DIR) defconfig \ 
    66                 MAINBOARDDIR="$(COREBOOT_VENDOR)/$(COREBOOT_BOARD)" \ 
     71                MAINBOARDDIR="$(COREBOOT_VENDOR)/$(CBV3_BOARD)" \ 
    6772                > $(CBV3_CONFIG_LOG) 2>&1 
    6873endif 
    … …  
    97102 
    98103coreboot-v3-config: | $(CBV3_STAMP_DIR)/.configured 
    99 ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) 
    100         @ cp -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) $(CBV3_SRC_DIR)/.config 
     104ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD) ]; then echo 1; fi),1) 
     105        @ cp -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD) $(CBV3_SRC_DIR)/.config 
    101106endif 
    102107        @ echo "Configure coreboot-v3..." 
    103108        @ $(MAKE) -C $(CBV3_SRC_DIR) menuconfig 
    104109        @ echo 
    105 ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) 
     110ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD) ]; then echo 1; fi),1) 
    106111        @ echo "Found an existing custom configuration file:" 
    107         @ echo "  $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)" 
     112        @ echo "  $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD)" 
    108113        @ echo "I've copied it back to the source directory for modification." 
    109114        @ echo "Remove the above file and re-run this command if you want to create a new custom configuration from scratch for this payload/board." 
    110115        @ echo 
    111116endif 
    112         @ cp -f $(CBV3_SRC_DIR)/.config $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) 
    113         @ echo "Your custom coreboot-v3 config file has been saved as $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)." 
     117        @ cp -f $(CBV3_SRC_DIR)/.config $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD) 
     118        @ echo "Your custom coreboot-v3 config file has been saved as $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(CBV3_BOARD)." 
    114119        @ echo 
    115120        @ touch $(CBV3_STAMP_DIR)/.configured