Makefile: Add mechanism for platforms to have multiple builtin DTBs
authorAnup Patel <anup.patel@wdc.com>
Mon, 25 May 2020 09:12:35 +0000 (14:42 +0530)
committerAnup Patel <anup@brainfault.org>
Fri, 5 Jun 2020 03:32:59 +0000 (09:02 +0530)
Currently, we can only include one DTB as builtin for a platform
using FDT_PAYLOAD_DTB make variable in platform config.mk.

This patch adds new mechanism using which we can convert any DTS
file to C source and futher compile-n-link it with libplatsbi.a.

The generated C source will have the DTB contents as an array
"const char <varprefix>_start[]" where <varprefix> is specified
in platform objects.mk makefile.

Example1
--------
If we have built-in k210.dts and desired <varprefix> is
"dt_k210" then specify following in platform objects.mk:
platform-objs-y += k210.o
platform-varprefix-k210.o = dt_k210

Example2
--------
If we have built-in abc/k210.dts and desired <varprefix> is
"dt_abc_k210" then specify following in platform objects.mk:
platform-objs-y += abc/k210.o
platform-varprefix-abc-k210.o = dt_abc_k210

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Makefile
scripts/d2c.sh [new file with mode: 0755]

index 5c08414..bf9c983 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -290,6 +290,12 @@ compile_objcopy = $(CMD_PREFIX)mkdir -p `dirname $(1)`; \
 compile_dts = $(CMD_PREFIX)mkdir -p `dirname $(1)`; \
             echo " DTC       $(subst $(build_dir)/,,$(1))"; \
             $(CPP) $(DTSCPPFLAGS) $(2) | $(DTC) -O dtb -i `dirname $(2)` -o $(1)
+compile_d2c = $(CMD_PREFIX)mkdir -p `dirname $(1)`; \
+            echo " D2C       $(subst $(build_dir)/,,$(1))"; \
+            $(src_dir)/scripts/d2c.sh -i $(4) -a $(3) -p $(2) > $(1)
+compile_gen_dep = $(CMD_PREFIX)mkdir -p `dirname $(1)`; \
+            echo " GEN-DEP   $(subst $(build_dir)/,,$(1))"; \
+            echo "$(1:.dep=$(2)): $(3)" >> $(1)
 
 targets-y  = $(build_dir)/lib/libsbi.a
 targets-y  += $(build_dir)/lib/libsbiutils.a
@@ -342,12 +348,23 @@ $(platform_build_dir)/%.dep: $(platform_src_dir)/%.c
 $(platform_build_dir)/%.o: $(platform_src_dir)/%.c
        $(call compile_cc,$@,$<)
 
+$(platform_build_dir)/%.o: $(platform_build_dir)/%.c
+       $(call compile_cc,$@,$<)
+
 $(platform_build_dir)/%.dep: $(platform_src_dir)/%.S
        $(call compile_as_dep,$@,$<)
 
 $(platform_build_dir)/%.o: $(platform_src_dir)/%.S
        $(call compile_as,$@,$<)
 
+$(platform_build_dir)/%.dep: $(platform_src_dir)/%.dts
+       $(call compile_gen_dep,$@,.dtb,$<)
+       $(call compile_gen_dep,$@,.c,$(@:.dep=.dtb))
+       $(call compile_gen_dep,$@,.o,$(@:.dep=.c))
+
+$(platform_build_dir)/%.c: $(platform_build_dir)/%.dtb
+       $(call compile_d2c,$@,$(platform-varprefix-$(subst .dtb,.o,$(subst /,-,$(subst $(platform_build_dir)/,,$<)))),16,$<)
+
 $(platform_build_dir)/%.dtb: $(platform_src_dir)/%.dts
        $(call compile_dts,$@,$<)
 
diff --git a/scripts/d2c.sh b/scripts/d2c.sh
new file mode 100755 (executable)
index 0000000..821a995
--- /dev/null
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+function usage()
+{
+       echo "Usage:"
+       echo " $0 [options]"
+       echo "Options:"
+       echo "     -h                   Display help or usage"
+       echo "     -i <input_file_path> Input binary file path"
+       echo "     -a <c_align>         Output C array alignment"
+       echo "     -p <c_prefix>        Output C array name prefix"
+       exit 1;
+}
+
+# Command line options
+INPUT_PATH=""
+OUTPUT_C_ALIGN=""
+OUTPUT_C_PREFIX=""
+
+while getopts "hi:a:p:o:" o; do
+       case "${o}" in
+       h)
+               usage
+               ;;
+       i)
+               INPUT_PATH=${OPTARG}
+               ;;
+       a)
+               OUTPUT_C_ALIGN=${OPTARG}
+               ;;
+       p)
+               OUTPUT_C_PREFIX=${OPTARG}
+               ;;
+       *)
+               usage
+               ;;
+       esac
+done
+shift $((OPTIND-1))
+
+if [ -z "${INPUT_PATH}" ]; then
+       echo "Must specify input file path"
+       usage
+fi
+
+if [ ! -f "${INPUT_PATH}" ]; then
+       echo "The input path should be a file"
+       usage
+fi
+
+if [ -z "${OUTPUT_C_ALIGN}" ]; then
+       echo "Must provide output C array alignment"
+       usage
+fi
+
+if [ -z "${OUTPUT_C_PREFIX}" ]; then
+       echo "Must provide output C array name prefix"
+       usage
+fi
+
+printf "const char __attribute__((aligned(%s))) %s_start[] = {\n" "${OUTPUT_C_ALIGN}" "${OUTPUT_C_PREFIX}"
+
+od -v -t x1 -An ${INPUT_PATH} | awk '{for (i=1; i<=NF; i++) printf " 0x%s,", $i; printf "\n"; }'
+
+printf "};\n"
+
+printf "const unsigned long %s_size = sizeof(%s_start);\n" "${OUTPUT_C_PREFIX}" "${OUTPUT_C_PREFIX}"