merge config/ and resources/

Signed-off-by: Leah Rowe <leah@libreboot.org>

6 files changed, 19 insertions, 19 deletions

diff --git a/script/build/boot/roms b/script/build/boot/roms
index 50b1f460..e5b06423 100755
--- a/script/build/boot/roms
+++ b/script/build/boot/roms
@@ -43,7 +43,7 @@ main()
 	firstoption="${1}"
 	[ "${firstoption}" = "help" ] && usage && exit 0
 	[ "${firstoption}" = "list" ] && \
-	    ./build command options resources/coreboot && exit 0
+	    ./build command options config/coreboot && exit 0
 
 	while [ $# -gt 0 ]; do
 		case ${1} in
@@ -66,7 +66,7 @@ main()
 	printf "Building %s ROM images\n" "${projectname}"
 
 	if [ "${firstoption}" = "all" ]; then
-		for target in $(./build command options resources/coreboot); do
+		for target in $(./build command options config/coreboot); do
 			buildrom "${target}" || err "build/roms (1): error"
 		done
 	else
@@ -96,7 +96,7 @@ usage()
 		./build boot roms x60 -p grub -d corebootfb -k usqwerty
 
 	possible values for 'target':
-	$(./build command options "resources/coreboot")
+	$(./build command options "config/coreboot")
 
 	Refer to the ${projectname} documentation for more information.
 	EOF
@@ -104,7 +104,7 @@ usage()
 
 # Build ROM images for supported boards
 buildrom() {
-	[ -d "resources/coreboot/${1}/" ] || \
+	[ -d "config/coreboot/${1}/" ] || \
 		err "build/roms: target not defined: ${1}"
 	./build boot roms_helper ${1}${opts} || return 1
 }
diff --git a/script/build/boot/roms_helper b/script/build/boot/roms_helper
index b663dc8e..a5cdb85c 100755
--- a/script/build/boot/roms_helper
+++ b/script/build/boot/roms_helper
@@ -30,13 +30,13 @@ set -u -e
 
 read projectname < projectname
 
-cfgsdir="resources/coreboot"
+cfgsdir="config/coreboot"
 
 blobs_required=""
 
 board=""
 ubdir=""
-kmapdir="resources/grub/keymap"
+kmapdir="config/grub/keymap"
 displaymodes=""
 payloads=""
 keyboard_layouts=""
@@ -370,7 +370,7 @@ build_grub_roms() {
 			# TODO: don't hardcode this. do it in target.cfg
 			backgroundfile="background1024x768.png"
 		fi
-		backgroundfile="resources/grub/background/${backgroundfile}"
+		backgroundfile="config/grub/background/${backgroundfile}"
 		"${cbfstool}" "${tmprompath}" add -f ${backgroundfile} \
 		    -n background.png -t raw || \
 		    err "build_grub_roms: cannot add background.png to tmprom"
diff --git a/script/build/coreboot/utils b/script/build/coreboot/utils
index 80711fae..803d27d4 100755
--- a/script/build/coreboot/utils
+++ b/script/build/coreboot/utils
@@ -33,7 +33,7 @@ main()
 			    err "cannot build cbutils for target, ${board}"
 		done
 	else
-		for boarddir in resources/coreboot/*; do
+		for boarddir in config/coreboot/*; do
 			[ ! -d "${boarddir}" ] && continue
 			build_for_mainboard ${boarddir##*/} || \
 			    err "cannot build cbutils for target, ${board}"
@@ -43,12 +43,12 @@ main()
 
 build_for_mainboard() {
 	board="${1}"
-	[ -d "resources/coreboot/${board}" ] || \
+	[ -d "config/coreboot/${board}" ] || \
 	    err "build_for_mainboard ${board}: boarddir does not exist"
-	[ -f "resources/coreboot/${board}/target.cfg" ] || \
+	[ -f "config/coreboot/${board}/target.cfg" ] || \
 	    err "build_for_mainboard ${board}: target.cfg does not exist"
 	tree="undefined"
-	. "resources/coreboot/${board}/target.cfg" # source
+	. "config/coreboot/${board}/target.cfg" # source
 	[ "${tree}" = "undefined" ] && \
 	    err "build_for_mainboard: improper tree definition for '${board}'"
 	buildutils "${tree}"
diff --git a/script/build/grub/payload b/script/build/grub/payload
index 359fc1f7..343e1b88 100755
--- a/script/build/grub/payload
+++ b/script/build/grub/payload
@@ -23,7 +23,7 @@ set -u -e
 
 . "include/err.sh"
 
-grubcfgsdir="resources/grub"
+grubcfgsdir="config/grub"
 
 . "${grubcfgsdir}/modules.list"
 
diff --git a/script/build/release/roms b/script/build/release/roms
index 1d6bcb76..ad2c3a98 100755
--- a/script/build/release/roms
+++ b/script/build/release/roms
@@ -89,10 +89,10 @@ make_archive()
 
 	echo ${target}
 
-	[ -f "resources/coreboot/${target}/target.cfg" ] || \
+	[ -f "config/coreboot/${target}/target.cfg" ] || \
 		err "make_archive: ${target}: target.cfg is missing"
 
-	. "resources/coreboot/${target}/target.cfg"
+	. "config/coreboot/${target}/target.cfg"
 	[ "${microcode_required}" = "y" ] || \
 	    [ "${microcode_required}" = "n" ] || microcode_required="y"
 
@@ -100,15 +100,15 @@ make_archive()
 	CONFIG_HAVE_ME_BIN="y"
 	CONFIG_KBC1126_FIRMWARE="y"
 	CONFIG_INCLUDE_SMSC_SCH5545_EC_FW="y"
-	grep "CONFIG_HAVE_ME_BIN=y" "resources/coreboot/${target}/config/"* || \
+	grep "CONFIG_HAVE_ME_BIN=y" "config/coreboot/${target}/config/"* || \
 	    CONFIG_HAVE_ME_BIN="n"
-	grep "CONFIG_HAVE_MRC=y" "resources/coreboot/${target}/config/"* || \
+	grep "CONFIG_HAVE_MRC=y" "config/coreboot/${target}/config/"* || \
 	    CONFIG_HAVE_MRC="n"
 	grep "CONFIG_KBC1126_FIRMWARE=y" \
-	    "resources/coreboot/${target}/config"/* || \
+	    "config/coreboot/${target}/config"/* || \
 	    CONFIG_KBC1126_FIRMWARE="n"
 	grep "CONFIG_INCLUDE_SMSC_SCH5545_EC_FW=y" \
-	    "resources/coreboot/${target}/config"/* || \
+	    "config/coreboot/${target}/config"/* || \
 	    CONFIG_INCLUDE_SMSC_SCH5545_EC_FW="n"
 
 	# remove ME/MRC/EC firmware from ROM images
diff --git a/script/build/release/src b/script/build/release/src
index 448e7b7b..97d8fb41 100755
--- a/script/build/release/src
+++ b/script/build/release/src
@@ -29,7 +29,7 @@ trees_fetch_list="coreboot u-boot seabios"
 simple_fetch_list="flashrom grub memtest86plus me_cleaner uefitool"
 simple_fetch_list="${simple_fetch_list} bios_extract biosutilities"
 
-dirlist="resources util script include config"
+dirlist="config util script include"
 
 filelist="lbmk modify build README.md COPYING update version handle"
 filelist="${filelist} versiondate projectname checkgit"