github.com/antonblanchard.microwatt
1
0
Fork 0
mirror of https://github.com/antonblanchard/microwatt.git synced 2026-02-27 00:59:41 +00:00
Code Releases Activity

console: Move console files

Browse Source 
console.c goes to a new lib/ where we'll store other general utilities
and console.h goes to include/

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt
2020-05-14 10:08:06 +10:00
parent a87b86e54f
commit 7bc118c7db
7 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hello_world/Makefile
View File

@@ -15,6 +15,9 @@ LDFLAGS = -T powerpc.lds
all: hello_world.hex
console.o: ../lib/console.c
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
hello_world.elf: hello_world.o head.o console.o
$(LD) $(LDFLAGS) -o $@ $^

3
hello_world/console.h → include/console.h
View File

@@ -4,6 +4,7 @@ void potato_uart_init(void);
void potato_uart_irq_en(void);
void potato_uart_irq_dis(void);
int getchar(void);
void putchar(unsigned char c);
int putchar(int c);
void putstr(const char *str, unsigned long len);
int puts(const char *str);
size_t strlen(const char *s);

0
hello_world/console.c → lib/console.c
View File

8
litedram/gen-src/sdram_init/Makefile
View File

@@ -4,7 +4,7 @@ include variables.mak
OBJ = $(BUILD_DIR)/obj
PROGRAM = sdram_init
OBJECTS = $(OBJ)/head.o $(OBJ)/main.o $(OBJ)/sdram.o
OBJECTS = $(OBJ)/head.o $(OBJ)/main.o $(OBJ)/sdram.o $(OBJ)/console.o
#### Compiler
@@ -50,10 +50,12 @@ all: objdir $(OBJ)/$(PROGRAM).hex
$(OBJ)/sdram.o: $(LXSRC_DIR)/sdram.c
$(call Q,CC, $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@, $@)
$(OBJ)/%.o : $(SRC_DIR)/%.S
$(call Q,AS, $(CC) $(ASFLAGS) -c $< -o $@, $@)
$(OBJ)/console.o: $(SRC_DIR)/../../../lib/console.c
$(call Q,CC, $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@, $@)
$(OBJ)/%.o : $(SRC_DIR)/%.c
$(call Q,CC, $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@, $@)
$(OBJ)/%.o : $(SRC_DIR)/%.S
$(call Q,AS, $(CC) $(ASFLAGS) -c $< -o $@, $@)
$(OBJ)/%.o : $(SRC_DIR)/libc/src/%.c
$(call Q,CC, $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@, $@)

2
rust_lib_demo/console.c
View File

@@ -1 +1 @@
../hello_world/console.c
../lib/console.c

2
rust_lib_demo/console.h
View File

@@ -1 +1 @@
../hello_world/console.h
../include/console.h

9
tests/Makefile.test
View File

@@ -9,14 +9,17 @@ CC = $(CROSS_COMPILE)gcc
LD = $(CROSS_COMPILE)ld
OBJCOPY = $(CROSS_COMPILE)objcopy
CFLAGS = -Os -g -Wall -std=c99 -msoft-float -mno-string -mno-multiple -mno-vsx -mno-altivec -mlittle-endian -fno-stack-protector -mstrict-align -ffreestanding -fdata-sections -ffunction-sections -I ../../hello_world -I ../../include
CFLAGS = -Os -g -Wall -std=c99 -msoft-float -mno-string -mno-multiple -mno-vsx -mno-altivec -mlittle-endian -fno-stack-protector -mstrict-align -ffreestanding -fdata-sections -ffunction-sections -I ../../include
ASFLAGS = $(CFLAGS)
LDFLAGS = -T powerpc.lds
all: $(TEST).hex
$(TEST).elf: $(TEST).o head.o ../../hello_world/console.o
$(LD) $(LDFLAGS) -o $(TEST).elf $(TEST).o head.o ../../hello_world/console.o
console.o: ../../lib/console.c
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
$(TEST).elf: $(TEST).o head.o console.o
$(LD) $(LDFLAGS) -o $(TEST).elf $(TEST).o head.o console.o
$(TEST).bin: $(TEST).elf
$(OBJCOPY) -O binary $(TEST).elf $(TEST).bin