Changeset 129


Ignore:
Timestamp:
Apr 20, 2010, 7:49:01 PM (5 years ago)
Author:
stepan
Message:

drop elfnote handling, it's been unused since cbfs but more likely since
coreboot v1

Location:
trunk/filo
Files:
7 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/filo/Config.in

    r127 r129  
    262262        bool "DEBUG_ALL"
    263263        select DEBUG_ELFBOOT
    264         select DEBUG_ELFNOTE
    265264        select DEBUG_SEGMENT
    266265        select DEBUG_SYS_INFO
     
    282281        default n
    283282
    284 config DEBUG_ELFNOTE
    285         bool "DEBUG_ELFNOTE"
    286         default n
    287 
    288283config DEBUG_SEGMENT
    289284        bool "DEBUG_SEGMENT"
  • trunk/filo/Makefile

    r128 r129  
    115115        $(Q)$(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC)
    116116
    117 $(TARGET): $(obj)/filo $(obj)/util/ebchecksum
     117$(TARGET): $(obj)/filo
    118118        $(Q)cp $(obj)/filo $@
    119119        $(Q)$(NM) $(obj)/filo | sort > $(obj)/filo.map
    120120        $(Q)printf "  STRIP   $(subst $(shell pwd)/,,$(@))\n"
    121121        $(Q)$(STRIP) -s $@
    122         $(Q)printf "  EBCHECK $(subst $(shell pwd)/,,$(@))\n"
    123         $(Q)$(obj)/util/ebchecksum -w $@
    124122
    125123include util/kconfig/Makefile
    126 include util/Makefile.inc
    127124
    128125$(obj)/%.o: $(src)/%.c
    129126        $(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
    130         $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
     127        $(Q)$(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
    131128
    132129$(obj)/%.S.o: $(src)/%.S
  • trunk/filo/build.sh

    r110 r129  
    11#!/bin/bash
    22
    3 CONFIG=defconfig
     3if [ "$1" == "" ]; then
     4        CONFIG=defconfig
     5fi
     6
     7build_with_config()
     8{
     9        cp configs/$1 ./.config
     10        $MAKE oldconfig
     11        $MAKE
     12}
    413
    514for make in make gmake gnumake; do
     
    1019done
    1120
    12 GCCPREFIX=invalid
    13 for gccprefixes in `pwd`/../coreboot/util/crossgcc/xgcc/bin/i386-elf- i386-elf- ""; do
    14         TMP=`mktemp /tmp/temp.XXXX`
    15         echo "mov %eax, %eax" > ${TMP}.s
    16         printf "\x7fELF" > ${TMP}.compare
    17         if which ${gccprefixes}as 2>/dev/null >/dev/null; then
    18                 printf ""
    19         else
    20                 continue
    21         fi
    22         if ${gccprefixes}as --32 -o ${TMP}.o ${TMP}.s; then
    23                 dd bs=4 count=1 if=${TMP}.o > ${TMP}.test 2>/dev/null
    24                 if cmp ${TMP}.test ${TMP}.compare; then
    25                         GCCPREFIX=$gccprefixes
    26                         rm -f $TMP ${TMP}.s ${TMP}.o ${TMP}.compare ${TMP}.test
    27                         break
    28                 fi
    29         fi
    30         rm -f $TMP ${TMP}.s ${TMP}.o ${TMP}.compare ${TMP}.test
    31 done
    32 
    33 if [ "$GCCPREFIX" = "invalid" ]; then
    34         echo no suitable gcc found
    35         exit 1
    36 fi
    37 
    38 MAKEFLAGS=" \
    39         AS=\"${GCCPREFIX}as --32\"              \
    40         CC=\"${GCCPREFIX}gcc -m32\"             \
    41         AR=\"${GCCPREFIX}ar\"                   \
    42         LD=\"${GCCPREFIX}ld -b elf32-i386\"     \
    43         STRIP=\"${GCCPREFIX}strip\"             \
    44         NM=\"${GCCPREFIX}nm\"                   \
    45         HOSTCC=gcc                              \
    46         -j                                      \
    47 "
    48 
     21FILO=$PWD
    4922$MAKE distclean
    50 cp configs/$CONFIG ./.config
    51 $MAKE oldconfig
    52 
    5323cd ../coreboot/payloads/libpayload
    5424$MAKE distclean
    55 cp configs/$CONFIG .config
    56 $MAKE oldconfig
    57 eval $MAKE $MAKEFLAGS
    58 eval $MAKE $MAKEFLAGS DESTDIR=../../../filo/build install
    59 cd ../../../filo
     25build_with_config $CONFIG
     26$MAKE DESTDIR=$FILO/build install
     27cd $FILO
     28build_with_config $CONFIG
    6029
    61 eval $MAKE $MAKEFLAGS
    62 
  • trunk/filo/configs/defconfig

    r127 r129  
    5555# CONFIG_DEBUG_ALL is not set
    5656# CONFIG_DEBUG_ELFBOOT is not set
    57 # CONFIG_DEBUG_ELFNOTE is not set
    5857# CONFIG_DEBUG_SEGMENT is not set
    5958# CONFIG_DEBUG_SYS_INFO is not set
  • trunk/filo/i386/sys_info.c

    r55 r129  
    3232    debug("boot ebx = %#lx\n", info->boot_data);
    3333    debug("boot arg = %#lx\n", info->boot_arg);
    34 
    35     collect_elfboot_info(info);
    3634}
  • trunk/filo/main/Makefile.inc

    r86 r129  
    1818
    1919TARGETS-y += main/filo.o main/strtox.o
    20 TARGETS-y += main/elfload.o main/elfnote.o main/ipchecksum.o
     20TARGETS-y += main/elfload.o main/ipchecksum.o
    2121TARGETS-$(CONFIG_SUPPORT_SOUND) += main/sound.o
    2222
  • trunk/filo/main/filo.c

    r113 r129  
    3131PAYLOAD_INFO(desc, "Bootloader");
    3232
     33const char const *program_name = PROGRAM_NAME;
     34const char const *program_version = PROGRAM_VERSION_FULL;
     35
    3336#define ENTER '\r'
    3437#define ESCAPE '\x1b'
Note: See TracChangeset for help on using the changeset viewer.