Refactor pk, bbl, machine into separate libraries

Yuck.

1 files changed, 212 insertions, 11 deletions

diff --git a/configure b/configure
index 0cd8fe2..6386de0 100755
--- a/configure
+++ b/configure
@@ -590,6 +590,7 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 subprojects_enabled
 subprojects
+BBL_PAYLOAD
 EGREP
 GREP
 CPP
@@ -667,6 +668,8 @@ enable_option_checking
 enable_stow
 enable_optional_subprojects
 enable_vm
+enable_logo
+with_payload
 enable_fp_emulation
 '
       ac_precious_vars='build_alias
@@ -1303,6 +1306,11 @@ Optional Features:
   --disable-logo          Disable boot logo
   --disable-fp-emulation  Disable floating-point emulation
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-payload          Set ELF payload for bbl
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -4046,9 +4054,53 @@ $as_echo "#define PK_ENABLE_VM /**/" >>confdefs.h
 
 fi
 
-# Check whether --enable-vm was given.
-if test "${enable_vm+set}" = set; then :
-  enableval=$enable_vm;
+
+
+
+
+    # Determine if this is a required or an optional subproject
+
+
+
+    # Determine if there is a group with the same name
+
+
+
+    # Create variations of the subproject name suitable for use as a CPP
+    # enabled define, a shell enabled variable, and a shell function
+
+
+
+
+
+
+
+
+
+
+
+    # Add subproject to our running list
+
+    subprojects="$subprojects bbl"
+
+    # Process the subproject appropriately. If enabled add it to the
+    # $enabled_subprojects running shell variable, set a
+    # SUBPROJECT_ENABLED C define, and include the appropriate
+    # 'subproject.ac'.
+
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : bbl" >&5
+$as_echo "$as_me: configuring default subproject : bbl" >&6;}
+      ac_config_files="$ac_config_files bbl.mk:bbl/bbl.mk.in"
+
+      enable_bbl_sproj="yes"
+      subprojects_enabled="$subprojects_enabled bbl"
+
+$as_echo "#define BBL_ENABLED /**/" >>confdefs.h
+
+      # Check whether --enable-logo was given.
+if test "${enable_logo+set}" = set; then :
+  enableval=$enable_logo;
 fi
 
 if test "x$enable_logo" != "xno"; then :
@@ -4059,16 +4111,13 @@ $as_echo "#define PK_ENABLE_LOGO /**/" >>confdefs.h
 
 fi
 
-# Check whether --enable-fp-emulation was given.
-if test "${enable_fp_emulation+set}" = set; then :
-  enableval=$enable_fp_emulation;
-fi
 
-if test "x$enable_fp_emulation" != "xno"; then :
-
-
-$as_echo "#define PK_ENABLE_FP_EMULATION /**/" >>confdefs.h
+# Check whether --with-payload was given.
+if test "${with_payload+set}" = set; then :
+  withval=$with_payload; BBL_PAYLOAD=$with_payload
 
+else
+  BBL_PAYLOAD=dummy_payload
 
 fi
 
@@ -4076,6 +4125,7 @@ fi
 
 
 
+
     # Determine if this is a required or an optional subproject
 
 
@@ -4121,6 +4171,153 @@ $as_echo "#define SOFTFLOAT_ENABLED /**/" >>confdefs.h
 
 
 
+    # Determine if this is a required or an optional subproject
+
+
+
+    # Determine if there is a group with the same name
+
+
+
+    # Create variations of the subproject name suitable for use as a CPP
+    # enabled define, a shell enabled variable, and a shell function
+
+
+
+
+
+
+
+
+
+
+
+    # Add subproject to our running list
+
+    subprojects="$subprojects dummy_payload"
+
+    # Process the subproject appropriately. If enabled add it to the
+    # $enabled_subprojects running shell variable, set a
+    # SUBPROJECT_ENABLED C define, and include the appropriate
+    # 'subproject.ac'.
+
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : dummy_payload" >&5
+$as_echo "$as_me: configuring default subproject : dummy_payload" >&6;}
+      ac_config_files="$ac_config_files dummy_payload.mk:dummy_payload/dummy_payload.mk.in"
+
+      enable_dummy_payload_sproj="yes"
+      subprojects_enabled="$subprojects_enabled dummy_payload"
+
+$as_echo "#define DUMMY_PAYLOAD_ENABLED /**/" >>confdefs.h
+
+
+
+
+
+
+    # Determine if this is a required or an optional subproject
+
+
+
+    # Determine if there is a group with the same name
+
+
+
+    # Create variations of the subproject name suitable for use as a CPP
+    # enabled define, a shell enabled variable, and a shell function
+
+
+
+
+
+
+
+
+
+
+
+    # Add subproject to our running list
+
+    subprojects="$subprojects machine"
+
+    # Process the subproject appropriately. If enabled add it to the
+    # $enabled_subprojects running shell variable, set a
+    # SUBPROJECT_ENABLED C define, and include the appropriate
+    # 'subproject.ac'.
+
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : machine" >&5
+$as_echo "$as_me: configuring default subproject : machine" >&6;}
+      ac_config_files="$ac_config_files machine.mk:machine/machine.mk.in"
+
+      enable_machine_sproj="yes"
+      subprojects_enabled="$subprojects_enabled machine"
+
+$as_echo "#define MACHINE_ENABLED /**/" >>confdefs.h
+
+      # Check whether --enable-fp-emulation was given.
+if test "${enable_fp_emulation+set}" = set; then :
+  enableval=$enable_fp_emulation;
+fi
+
+if test "x$enable_fp_emulation" != "xno"; then :
+
+
+$as_echo "#define PK_ENABLE_FP_EMULATION /**/" >>confdefs.h
+
+
+fi
+
+
+
+
+
+    # Determine if this is a required or an optional subproject
+
+
+
+    # Determine if there is a group with the same name
+
+
+
+    # Create variations of the subproject name suitable for use as a CPP
+    # enabled define, a shell enabled variable, and a shell function
+
+
+
+
+
+
+
+
+
+
+
+    # Add subproject to our running list
+
+    subprojects="$subprojects util"
+
+    # Process the subproject appropriately. If enabled add it to the
+    # $enabled_subprojects running shell variable, set a
+    # SUBPROJECT_ENABLED C define, and include the appropriate
+    # 'subproject.ac'.
+
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : util" >&5
+$as_echo "$as_me: configuring default subproject : util" >&6;}
+      ac_config_files="$ac_config_files util.mk:util/util.mk.in"
+
+      enable_util_sproj="yes"
+      subprojects_enabled="$subprojects_enabled util"
+
+$as_echo "#define UTIL_ENABLED /**/" >>confdefs.h
+
+
+
+
+
+
   # Output make variables
 
 
@@ -4838,7 +5035,11 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "pk.mk") CONFIG_FILES="$CONFIG_FILES pk.mk:pk/pk.mk.in" ;;
+    "bbl.mk") CONFIG_FILES="$CONFIG_FILES bbl.mk:bbl/bbl.mk.in" ;;
     "softfloat.mk") CONFIG_FILES="$CONFIG_FILES softfloat.mk:softfloat/softfloat.mk.in" ;;
+    "dummy_payload.mk") CONFIG_FILES="$CONFIG_FILES dummy_payload.mk:dummy_payload/dummy_payload.mk.in" ;;
+    "machine.mk") CONFIG_FILES="$CONFIG_FILES machine.mk:machine/machine.mk.in" ;;
+    "util.mk") CONFIG_FILES="$CONFIG_FILES util.mk:util/util.mk.in" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;