Author: stepan Date: Tue Apr 20 19:49:01 2010 New Revision: 129 URL: http://tracker.coreboot.org/trac/filo/changeset/129
Log: drop elfnote handling, it's been unused since cbfs but more likely since coreboot v1
Deleted: trunk/filo/main/elfnote.c trunk/filo/util/Makefile.inc trunk/filo/util/byteorder.h trunk/filo/util/checksum_elf.c trunk/filo/util/ebchecksum.c trunk/filo/util/ebchecksum.h trunk/filo/util/vmser.c Modified: trunk/filo/Config.in trunk/filo/Makefile trunk/filo/build.sh trunk/filo/configs/defconfig trunk/filo/i386/sys_info.c trunk/filo/main/Makefile.inc trunk/filo/main/filo.c
Modified: trunk/filo/Config.in ============================================================================== --- trunk/filo/Config.in Tue Apr 20 19:34:16 2010 (r128) +++ trunk/filo/Config.in Tue Apr 20 19:49:01 2010 (r129) @@ -261,7 +261,6 @@ config DEBUG_ALL bool "DEBUG_ALL" select DEBUG_ELFBOOT - select DEBUG_ELFNOTE select DEBUG_SEGMENT select DEBUG_SYS_INFO select DEBUG_BLOCKDEV @@ -281,10 +280,6 @@ bool "DEBUG_ELFBOOT" default n
-config DEBUG_ELFNOTE - bool "DEBUG_ELFNOTE" - default n - config DEBUG_SEGMENT bool "DEBUG_SEGMENT" default n
Modified: trunk/filo/Makefile ============================================================================== --- trunk/filo/Makefile Tue Apr 20 19:34:16 2010 (r128) +++ trunk/filo/Makefile Tue Apr 20 19:49:01 2010 (r129) @@ -114,20 +114,17 @@ $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" $(Q)$(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC)
-$(TARGET): $(obj)/filo $(obj)/util/ebchecksum +$(TARGET): $(obj)/filo $(Q)cp $(obj)/filo $@ $(Q)$(NM) $(obj)/filo | sort > $(obj)/filo.map $(Q)printf " STRIP $(subst $(shell pwd)/,,$(@))\n" $(Q)$(STRIP) -s $@ - $(Q)printf " EBCHECK $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(obj)/util/ebchecksum -w $@
include util/kconfig/Makefile -include util/Makefile.inc
$(obj)/%.o: $(src)/%.c $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + $(Q)$(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
$(obj)/%.S.o: $(src)/%.S $(Q)printf " AS $(subst $(shell pwd)/,,$(@))\n"
Modified: trunk/filo/build.sh ============================================================================== --- trunk/filo/build.sh Tue Apr 20 19:34:16 2010 (r128) +++ trunk/filo/build.sh Tue Apr 20 19:49:01 2010 (r129) @@ -1,6 +1,15 @@ #!/bin/bash
-CONFIG=defconfig +if [ "$1" == "" ]; then + CONFIG=defconfig +fi + +build_with_config() +{ + cp configs/$1 ./.config + $MAKE oldconfig + $MAKE +}
for make in make gmake gnumake; do if [ "`$make --version 2>/dev/null | grep -c GNU`" -gt 0 ]; then @@ -9,54 +18,12 @@ fi done
-GCCPREFIX=invalid -for gccprefixes in `pwd`/../coreboot/util/crossgcc/xgcc/bin/i386-elf- i386-elf- ""; do - TMP=`mktemp /tmp/temp.XXXX` - echo "mov %eax, %eax" > ${TMP}.s - printf "\x7fELF" > ${TMP}.compare - if which ${gccprefixes}as 2>/dev/null >/dev/null; then - printf "" - else - continue - fi - if ${gccprefixes}as --32 -o ${TMP}.o ${TMP}.s; then - dd bs=4 count=1 if=${TMP}.o > ${TMP}.test 2>/dev/null - if cmp ${TMP}.test ${TMP}.compare; then - GCCPREFIX=$gccprefixes - rm -f $TMP ${TMP}.s ${TMP}.o ${TMP}.compare ${TMP}.test - break - fi - fi - rm -f $TMP ${TMP}.s ${TMP}.o ${TMP}.compare ${TMP}.test -done - -if [ "$GCCPREFIX" = "invalid" ]; then - echo no suitable gcc found - exit 1 -fi - -MAKEFLAGS=" \ - AS="${GCCPREFIX}as --32" \ - CC="${GCCPREFIX}gcc -m32" \ - AR="${GCCPREFIX}ar" \ - LD="${GCCPREFIX}ld -b elf32-i386" \ - STRIP="${GCCPREFIX}strip" \ - NM="${GCCPREFIX}nm" \ - HOSTCC=gcc \ - -j \ -" - +FILO=$PWD $MAKE distclean -cp configs/$CONFIG ./.config -$MAKE oldconfig - cd ../coreboot/payloads/libpayload $MAKE distclean -cp configs/$CONFIG .config -$MAKE oldconfig -eval $MAKE $MAKEFLAGS -eval $MAKE $MAKEFLAGS DESTDIR=../../../filo/build install -cd ../../../filo - -eval $MAKE $MAKEFLAGS +build_with_config $CONFIG +$MAKE DESTDIR=$FILO/build install +cd $FILO +build_with_config $CONFIG
Modified: trunk/filo/configs/defconfig ============================================================================== --- trunk/filo/configs/defconfig Tue Apr 20 19:34:16 2010 (r128) +++ trunk/filo/configs/defconfig Tue Apr 20 19:49:01 2010 (r129) @@ -54,7 +54,6 @@ CONFIG_EXPERIMENTAL=y # CONFIG_DEBUG_ALL is not set # CONFIG_DEBUG_ELFBOOT is not set -# CONFIG_DEBUG_ELFNOTE is not set # CONFIG_DEBUG_SEGMENT is not set # CONFIG_DEBUG_SYS_INFO is not set # CONFIG_DEBUG_BLOCKDEV is not set
Modified: trunk/filo/i386/sys_info.c ============================================================================== --- trunk/filo/i386/sys_info.c Tue Apr 20 19:34:16 2010 (r128) +++ trunk/filo/i386/sys_info.c Tue Apr 20 19:49:01 2010 (r129) @@ -31,6 +31,4 @@ debug("boot eax = %#lx\n", info->boot_type); debug("boot ebx = %#lx\n", info->boot_data); debug("boot arg = %#lx\n", info->boot_arg); - - collect_elfboot_info(info); }
Modified: trunk/filo/main/Makefile.inc ============================================================================== --- trunk/filo/main/Makefile.inc Tue Apr 20 19:34:16 2010 (r128) +++ trunk/filo/main/Makefile.inc Tue Apr 20 19:49:01 2010 (r129) @@ -17,6 +17,6 @@ #
TARGETS-y += main/filo.o main/strtox.o -TARGETS-y += main/elfload.o main/elfnote.o main/ipchecksum.o +TARGETS-y += main/elfload.o main/ipchecksum.o TARGETS-$(CONFIG_SUPPORT_SOUND) += main/sound.o
Modified: trunk/filo/main/filo.c ============================================================================== --- trunk/filo/main/filo.c Tue Apr 20 19:34:16 2010 (r128) +++ trunk/filo/main/filo.c Tue Apr 20 19:49:01 2010 (r129) @@ -30,6 +30,9 @@ PAYLOAD_INFO(listname, PROGRAM_NAME); PAYLOAD_INFO(desc, "Bootloader");
+const char const *program_name = PROGRAM_NAME; +const char const *program_version = PROGRAM_VERSION_FULL; + #define ENTER '\r' #define ESCAPE '\x1b'