diff --git a/build/expand_melis.sh b/build/expand_melis.sh index abac78df2..bd1e6ed78 100755 --- a/build/expand_melis.sh +++ b/build/expand_melis.sh @@ -24,7 +24,7 @@ declare -A board_name_map=( ["v851s_fastboot_sc1725v01_nor"]="v851-e907-sc1725v01-board" ["v851s_fastboot_sl100_back"]="v851-e907-sl100_back-board" ["v851s3_fastboot_sl100_front"]="v851s3-e907-sl100-front-board" - ["v851s_fastboot_h13_pv"]="v851s3-e907-h13-pv-board" + ["v851s_fastboot_h13_pv"]="v851-e907-h13-pv-board" ) function get_melis_board_name() { diff --git a/lichee/brandy-2.0/spl/.gitignore b/lichee/brandy-2.0/spl/.gitignore index 90cbe6f4c..81ebcf722 100644 --- a/lichee/brandy-2.0/spl/.gitignore +++ b/lichee/brandy-2.0/spl/.gitignore @@ -18,3 +18,5 @@ drivers/dram/sun50iw10p1/libchipid drivers/dram/sun50iw11p1/libchipid *.patch *.swp +!boot0.lds +!fes1.lds diff --git a/lichee/brandy-2.0/spl/arch/arm/cpu/armv7/boot0.lds b/lichee/brandy-2.0/spl/arch/arm/cpu/armv7/boot0.lds new file mode 100755 index 000000000..cbc486d65 --- /dev/null +++ b/lichee/brandy-2.0/spl/arch/arm/cpu/armv7/boot0.lds @@ -0,0 +1,39 @@ +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + . = BOOT0ADDR; + . = ALIGN(4); + + .head : + { + main/boot0_head.o (.rodata) + } + . = ALIGN(1); + .text : + { + CPUDIR/boot0_entry.o (.text) + SOLUTIONDIR/libsolution.o (.text) + *(.text) + } + . = ALIGN(16); + .rodata : { *(.rodata) } + . = ALIGN(16); + .data : { *(.data) } + + . = ALIGN(4); + .bss : + { + __bss_start = .; + *(.bss) + } + . = ALIGN(4); + __bss_end = .; + + _end = .; + ASSERT(. <= (BOOT0ADDR + BOOT0SIZE), "boot0 image has exceeded its limit.") +} + + + diff --git a/lichee/brandy-2.0/spl/arch/arm/cpu/armv7/fes1.lds b/lichee/brandy-2.0/spl/arch/arm/cpu/armv7/fes1.lds new file mode 100755 index 000000000..464c9ba76 --- /dev/null +++ b/lichee/brandy-2.0/spl/arch/arm/cpu/armv7/fes1.lds @@ -0,0 +1,36 @@ +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + . = FES1ADDR; + . = ALIGN(4); + + .head : + { + main/fes1_head.o (.rodata) + } + .text : + { + CPUDIR/fes1_entry.o (.text) + *(.text) + } + . = ALIGN(16); + .rodata : { *(.rodata) } + . = ALIGN(16); + .data : { *(.data) } + + . = ALIGN(4); + .bss : + { + __bss_start = .; + *(.bss) + } + . = ALIGN(4); + __bss_end = .; + + _end = .; +} + + + diff --git a/lichee/brandy-2.0/u-boot-2018/scripts/dtc/dtc b/lichee/brandy-2.0/u-boot-2018/scripts/dtc/dtc new file mode 100755 index 000000000..df4a17b5b Binary files /dev/null and b/lichee/brandy-2.0/u-boot-2018/scripts/dtc/dtc differ