Merge remote-tracking branch 'zytor/master' into elflink
authorMatt Fleming <matt.fleming@linux.intel.com>
Tue, 26 Apr 2011 08:46:34 +0000 (09:46 +0100)
committerMatt Fleming <matt.fleming@linux.intel.com>
Tue, 26 Apr 2011 08:46:34 +0000 (09:46 +0100)
We need the recent Makefile filename changes to be merged into the
elflink branch because it will make things simpler when converting all
modules to ELF format.

Conflicts:
com32/Makefile
com32/modules/Makefile
version

12 files changed:
1  2 
com32/Makefile
com32/lib/Makefile
core/Makefile
core/diskfs.inc
core/diskstart.inc
core/isolinux.asm
core/ui.inc
libinstaller/syslxmod.c
mk/com32.mk
mk/devel.mk
mk/lib.mk
mk/syslinux.mk

diff --cc com32/Makefile
@@@ -1,4 -1,5 +1,5 @@@
- SUBDIRS = tools lib gpllib libutil modules mboot menu samples elflink elflink/modules rosh cmenu \
 -SUBDIRS = libupload tools lib gpllib libutil modules mboot menu samples rosh cmenu \
 -        hdt gfxboot sysdump lua/src
++SUBDIRS = libupload tools lib gpllib libutil modules mboot menu samples elflink elflink/modules rosh cmenu \
 +        hdt gfxboot sysdump lua/src elflink/ldlinux
  all tidy dist clean spotless install:
        set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
  
  # Include configuration rules
  NOGPL := 1
- topdir = ../..
- include MCONFIG
+ topdir = ../../
+ MAKEDIR = $(topdir)/mk
+ include $(MAKEDIR)/lib.mk
  
 -LIBOBJS = \
 -      abort.o atexit.o atoi.o atol.o atoll.o calloc.o creat.o         \
 +## OPTIONAL OBJECTS, AVAILABLE AS DYNAMIC LINKED MODULES
 +# PNG library object files
 +LIBPNG_OBJS = \
 +      libpng/png.o libpng/pngset.o libpng/pngget.o libpng/pngrutil.o  \
 +      libpng/pngtrans.o libpng/pngwutil.o libpng/pngread.o            \
 +      libpng/pngrio.o libpng/pngwio.o libpng/pngwrite.o               \
 +      libpng/pngrtran.o libpng/pngwtran.o libpng/pngmem.o             \
 +      libpng/pngerror.o libpng/pngpread.o
 +      
 +# ZIP library object files
 +LIBZLIB_OBJS = \
 +      zlib/adler32.o zlib/compress.o zlib/crc32.o                     \
 +      zlib/uncompr.o zlib/deflate.o zlib/trees.o zlib/zutil.o         \
 +      zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/inffast.o    \
 +      sys/zfile.o sys/zfopen.o
 +
 +# JPG library object files
 +LIBJPG_OBJS = \
 +      jpeg/tinyjpeg.o jpeg/jidctflt.o jpeg/decode1.o jpeg/decode3.o   \
 +      jpeg/rgb24.o jpeg/bgr24.o jpeg/yuv420p.o jpeg/grey.o            \
 +      jpeg/rgba32.o jpeg/bgra32.o                                     
 +
 +LIBVESA_OBJS = \
 +      sys/vesacon_write.o sys/vesaserial_write.o                      \
 +      sys/vesa/initvesa.o sys/vesa/drawtxt.o  sys/vesa/background.o   \
 +      sys/vesa/alphatbl.o sys/vesa/screencpy.o sys/vesa/fmtpixel.o
 +
 +LIBPCI_OBJS = \
 +      pci/cfgtype.o pci/scan.o pci/bios.o                             \
 +      pci/readb.o pci/readw.o pci/readl.o                             \
 +      pci/writeb.o pci/writew.o pci/writel.o
 +
 +LIBSYSLINUX_OBJS = \
 +      syslinux/reboot.o syslinux/keyboard.o                           \
 +      syslinux/features.o syslinux/config.o   \
 +      syslinux/ipappend.o syslinux/dsinfo.o syslinux/version.o        \
 +      syslinux/pxe_get_cached.o syslinux/pxe_get_nic.o                \
 +      syslinux/adv.o syslinux/advwrite.o syslinux/getadv.o            \
 +      syslinux/setadv.o
 +
 +LIBLOAD_OBJS = \
 +      syslinux/addlist.o syslinux/freelist.o syslinux/memmap.o        \
 +      syslinux/movebits.o syslinux/shuffle.o syslinux/shuffle_pm.o    \
 +      syslinux/shuffle_rm.o syslinux/zonelist.o                       \
 +      syslinux/dump_mmap.o syslinux/dump_movelist.o                   \
 +      \
 +      syslinux/run_default.o syslinux/run_command.o                   \
 +      syslinux/cleanup.o syslinux/localboot.o syslinux/runimage.o     \
 +      \
 +      syslinux/loadfile.o syslinux/floadfile.o syslinux/zloadfile.o   \
 +      \
 +      syslinux/load_linux.o syslinux/initramfs.o                      \
 +      syslinux/initramfs_file.o syslinux/initramfs_loadfile.o         \
 +      syslinux/initramfs_archive.o
 +
 +DYNENTRY_OBJS = \
 +      atexit.o onexit.o abort.o
 +
 +## CORE OBJECTS, INCLUDED IN THE ROOT COM32 MODULE
 +LIBENTRY_OBJS = \
 +      sys/intcall.o sys/farcall.o sys/cfarcall.o sys/zeroregs.o       \
 +      sys/argv.o                                                      \
 +      sys/fileinfo.o sys/opendev.o sys/read.o sys/write.o sys/ftell.o \
 +      sys/close.o sys/open.o sys/fileread.o sys/fileclose.o           \
 +      sys/openmem.o                                   \
 +      sys/isatty.o sys/fstat.o                                        \
 +      \
 +      syslinux/idle.o                                                 \
 +      \
 +      exit.o
 +
 +LIBMODULE_OBJS = \
 +      sys/module/common.o sys/module/elf_module.o             \
 +      sys/module/shallow_module.o     sys/module/elfutils.o   \
 +      sys/module/exec.o
 +
 +LIBGCC_OBJS = \
 +      libgcc/__ashldi3.o libgcc/__udivdi3.o                   \
 +      libgcc/__negdi2.o libgcc/__ashrdi3.o libgcc/__lshrdi3.o         \
 +      libgcc/__muldi3.o libgcc/__udivmoddi4.o libgcc/__umoddi3.o      \
 +      libgcc/__divdi3.o libgcc/__moddi3.o
 +      
 +LIBCONSOLE_OBJS = \
 +      \
 +      sys/openconsole.o sys/line_input.o                              \
 +      sys/colortable.o sys/screensize.o                               \
 +      \
 +      sys/stdcon_read.o sys/stdcon_write.o sys/rawcon_read.o          \
 +      sys/rawcon_write.o sys/err_read.o sys/err_write.o               \
 +      sys/null_read.o sys/null_write.o sys/serial_write.o             \
 +      \
 +      sys/xserial_write.o                                             \
 +      \
 +      sys/ansi.o                                                      \
 +      \
 +      sys/ansicon_write.o sys/ansiserial_write.o      \
 +      \
 +      syslinux/serial.o
 +
 +LIBOTHER_OBJS = \
 +      atoi.o atol.o atoll.o calloc.o creat.o          \
        ctypes.o errno.o fgetc.o fgets.o fopen.o fprintf.o fputc.o      \
 -      fclose.o putchar.o setjmp.o                                     \
 -      fputs.o fread2.o fread.o free.o fwrite2.o fwrite.o              \
 +      fclose.o putchar.o setjmp.o                             \
 +      fputs.o fread2.o fread.o fwrite2.o fwrite.o                     \
        getopt.o getopt_long.o                                          \
 -      lrand48.o malloc.o stack.o memccpy.o memchr.o memcmp.o          \
 +      lrand48.o stack.o memccpy.o memchr.o memcmp.o           \
        memcpy.o mempcpy.o memmem.o memmove.o memset.o memswap.o        \
 -      exit.o onexit.o \
 -      perror.o printf.o puts.o qsort.o realloc.o seed48.o snprintf.o  \
 -      sprintf.o srand48.o sscanf.o stack.o strcasecmp.o strcat.o      \
 -      strchr.o strcmp.o strcpy.o strdup.o strlen.o                    \
 -      strerror.o strnlen.o                                            \
 -      strncasecmp.o strncat.o strncmp.o strncpy.o strndup.o           \
 -      stpcpy.o stpncpy.o                                              \
 +      perror.o printf.o puts.o qsort.o seed48.o snprintf.o    \
 +      sprintf.o srand48.o sscanf.o strcasecmp.o strcat.o      \
 +      strchr.o strcmp.o strcpy.o strdup.o strerror.o strlen.o         \
 +      strnlen.o                                                       \
 +      strncat.o strncmp.o strncpy.o strndup.o         \
 +      stpcpy.o stpncpy.o                                              \
        strntoimax.o strntoumax.o strrchr.o strsep.o strspn.o strstr.o  \
        strtoimax.o strtok.o strtol.o strtoll.o strtoul.o strtoull.o    \
        strtoumax.o vfprintf.o vprintf.o vsnprintf.o vsprintf.o         \
        asprintf.o vasprintf.o strlcpy.o strlcat.o                      \
 -      vsscanf.o zalloc.o                                              \
 +      vsscanf.o                                                       \
        skipspace.o                                                     \
+       chrreplace.o                                                    \
+       bufprintf.o                                                     \
+       inet.o                                                          \
        \
        lmalloc.o lstrdup.o                                             \
        \
diff --cc core/Makefile
Simple merge
diff --cc core/diskfs.inc
Simple merge
Simple merge
Simple merge
diff --cc core/ui.inc
@@@ -688,20 -681,9 +688,17 @@@ is_bad_image
  %else
  is_bss_sector equ is_bad_image
  %endif
- %if IS_ISOLINUX
-               ; ok
- %else
- is_disk_image equ is_bad_image
- %endif
+ is_disk_image equ is_bad_image        ; No longer supported
  
 +%endif                ; start of replacing ui.inc
 +
 +              section .bss16
 +              alignb 4
 +Kernel_EAX    resd 1
 +Kernel_SI     resw 1
 +
 +
                section .data16
  boot_prompt   db 'boot: ', 0
  wipe_char     db BS, ' ', BS, 0
Simple merge
diff --cc mk/com32.mk
Simple merge
diff --cc mk/devel.mk
Simple merge
diff --cc mk/lib.mk
Simple merge
diff --cc mk/syslinux.mk
Simple merge