Layout improved before branch merge

master
kaqu 2 years ago
parent 8bb4a4d5e2
commit 17e9a5cc26
  1. 0
      software/include/illumination.h
  2. 11
      software/ramcreate.sh
  3. 10
      software/source/illumination.c
  4. 10
      software/source/main.c

@ -8,9 +8,10 @@
# 10.10.20/KQ Initial (running) version
#
# Test for missing ('zero length') basefilename
# Test for missing ('zero length') basefilenames
if [[ -z $1 || -z $2 ]]; then
echo "usage: ./ramcreate.sh <mainfile_w/o_extension> <jobfile_w/o_extension>"
echo "example: ./ramcreate.sh main illumination"
exit
fi
@ -55,10 +56,10 @@ COMMONFLAGS="-O0 $CPUFLAGS -g3 -fomit-frame-pointer -Wall -fno-builtin -nostdinc
CFLAGS="-fexceptions -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes"
LDFLAGS="-nostdlib -nodefaultlibs -L$BUILDINC_DIRECTORY"
echo "--"
echo "calling gcc with: -c $COMMONFLAGS $CFLAGS -Wa,-fPIC"
#$MY_LOCAL_LITEX_PATH/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc -O0 -S -nostdinc $COMMONFLAGS $INCLUDES -Wa,-fPIC $1.c
$MY_LOCAL_LITEX_PATH/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc -c $COMMONFLAGS $CFLAGS -Wa,-fPIC $2.c -o build/$2.o
$MY_LOCAL_LITEX_PATH/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc -c $COMMONFLAGS $CFLAGS -Wa,-fPIC $1.c -o build/$1.o
echo "calling gcc with: -c $COMMONFLAGS $CFLAGS -Wa,-fPIC for $1 & $2"
#$MY_LOCAL_LITEX_PATH/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc -O0 -S -nostdinc $COMMONFLAGS $INCLUDES -Wa,-fPIC source/$1.c
$MY_LOCAL_LITEX_PATH/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc -c $COMMONFLAGS $CFLAGS -Wa,-fPIC source/$2.c -o build/$2.o
$MY_LOCAL_LITEX_PATH/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-gcc -c $COMMONFLAGS $CFLAGS -Wa,-fPIC source/$1.c -o build/$1.o
echo "--"
echo "calling ld with: $LDFLAGS $OBJECTS build/$2.o build/$1.o -o build/$1.bin"
$MY_LOCAL_LITEX_PATH/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-ubuntu14/bin/riscv64-unknown-elf-ld $LDFLAGS -T linker/linker.ld -N $CRT0 $OBJECTS $LXR build/$2.o build/$1.o -o build/$1.elf

@ -23,10 +23,10 @@
#include "helpers.h"
#include "command.h"
#include "../build/colorlight_5a_75b/software/include/generated/csr.h"
#include "../build/colorlight_5a_75b/software/include/generated/soc.h"
#include "../build/colorlight_5a_75b/software/include/generated/mem.h"
#include "../build/colorlight_5a_75b/software/include/generated/git.h"
#include "../../build/colorlight_5a_75b/software/include/generated/csr.h"
#include "../../build/colorlight_5a_75b/software/include/generated/soc.h"
#include "../../build/colorlight_5a_75b/software/include/generated/mem.h"
#include "../../build/colorlight_5a_75b/software/include/generated/git.h"
#include <spiflash.h>
@ -39,7 +39,7 @@
#include <liblitesdcard/sdcard.h>
#include "illumination.h"
#include "../include/illumination.h"
extern void busy_wait(unsigned int ms); // Worx!
#define MAXTABLES 3 // 1..16 MUST match h/w!

@ -23,10 +23,10 @@
#include "helpers.h"
#include "command.h"
#include "../build/colorlight_5a_75b/software/include/generated/csr.h"
#include "../build/colorlight_5a_75b/software/include/generated/soc.h"
#include "../build/colorlight_5a_75b/software/include/generated/mem.h"
#include "../build/colorlight_5a_75b/software/include/generated/git.h"
#include "../../build/colorlight_5a_75b/software/include/generated/csr.h"
#include "../../build/colorlight_5a_75b/software/include/generated/soc.h"
#include "../../build/colorlight_5a_75b/software/include/generated/mem.h"
#include "../../build/colorlight_5a_75b/software/include/generated/git.h"
#include <spiflash.h>
@ -39,7 +39,7 @@
#include <liblitesdcard/sdcard.h>
#include "illumination.h"
#include "../include/illumination.h"
extern void busy_wait(unsigned int ms); // Worx!
Loading…
Cancel
Save