Skip to content

Commit

Permalink
Update ARP component build
Browse files Browse the repository at this point in the history
  • Loading branch information
@JE-Archer
JE-Archer committed Dec 14, 2023
1 parent 8cea4c5 commit 70d42c3
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
38 changes: 19 additions & 19 deletions examples/kitty/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,30 +186,30 @@ $(BUILD_DIR)/ethernet.elf: $(BUILD_DIR)/meson_ethernet.o $(BUILD_DIR)/sddf_netwo
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@

NETWORK_COMPONENTS := $(SDDF)/network/components
NETWORK_COMPONENT_CFLAGS := \
NETWORK_COMPONENTS_INCLUDE := \
-I$(SDDF)/include \
-I$(SDDF)/util/include \
-I$(BOARD_DIR)/include \
-I$(LWIP)/include \
-I$(LWIP)/include/ipv4 \
-mtune=$(CPU) \
-I$(LWIP)/include/ipv4
NETWORK_COMPONENT_CFLAGS := \
$(NETWORK_COMPONENTS_INCLUDE) \
-mstrict-align \
-ffreestanding \
-g \
-O0 \
-Wall \
-Wno-unused-function \
-I$(LIBVMM)/src/arch/aarch64 \
-I$(LIBVMM)/src \
-I$(LIBVMM)/src/util \
-DBOARD_$(MICROKIT_BOARD)
NETWORK_COMPONENTS_LDFLAGS := \
-L$(BOARD_DIR)/lib \
-L$(SDDF)/lib
NETWORK_COMPONENTS_LIBS := \
-lmicrokit \
-Tmicrokit.ld \
-lc
-DNO_ASSERT \
-DBOARD_$(MICROKIT_BOARD) \
-MD \
-MP

NETWORK_COMPONENTS_LDFLAGS := -L$(BOARD_DIR)/lib -L$(SDDF)/lib -L$(LIBGCC)
NETWORK_COMPONENTS_LIBS := -lmicrokit -Tmicrokit.ld -lc -lgcc

$(BUILD_DIR)/cache.o: $(SDDF)/util/cache.c
aarch64-none-elf-gcc -c $(NETWORK_COMPONENT_CFLAGS) $< -o $@

$(BUILD_DIR)/copy.o: $(NETWORK_COMPONENTS)/copy.c
aarch64-none-elf-gcc -c $(NETWORK_COMPONENT_CFLAGS) $< -o $@
Expand All @@ -224,16 +224,16 @@ $(BUILD_DIR)/arp.o: $(NETWORK_COMPONENTS)/arp.c
aarch64-none-elf-gcc -c $(NETWORK_COMPONENT_CFLAGS) $< -o $@

$(BUILD_DIR)/copy.elf: $(BUILD_DIR)/copy.o $(BUILD_DIR)/sddf_network_sharedringbuffer.o
$(LD) $(NETWORK_COMPONENTS_LDFLAGS) build/sddf_network_sharedringbuffer.o build/copy.o $(NETWORK_COMPONENTS_LIBS) -o build/copy.elf
aarch64-none-elf-ld $(NETWORK_COMPONENTS_LDFLAGS) $(BUILD_DIR)/sddf_network_sharedringbuffer.o $(BUILD_DIR)/copy.o $(NETWORK_COMPONENTS_LIBS) -o $(BUILD_DIR)/copy.elf

$(BUILD_DIR)/mux_rx.elf: $(BUILD_DIR)/mux_rx.o $(BUILD_DIR)/sddf_network_sharedringbuffer.o
$(LD) $(NETWORK_COMPONENTS_LDFLAGS) build/sddf_network_sharedringbuffer.o build/mux_rx.o $(NETWORK_COMPONENTS_LIBS) -o build/mux_rx.elf
aarch64-none-elf-ld $(NETWORK_COMPONENTS_LDFLAGS) $(BUILD_DIR)/sddf_network_sharedringbuffer.o $(BUILD_DIR)/mux_rx.o $(NETWORK_COMPONENTS_LIBS) -o $(BUILD_DIR)/mux_rx.elf

$(BUILD_DIR)/mux_tx.elf: $(BUILD_DIR)/mux_tx.o $(BUILD_DIR)/sddf_network_sharedringbuffer.o
$(LD) $(NETWORK_COMPONENTS_LDFLAGS) build/sddf_network_sharedringbuffer.o build/mux_tx.o $(NETWORK_COMPONENTS_LIBS) -o build/mux_tx.elf
aarch64-none-elf-ld $(NETWORK_COMPONENTS_LDFLAGS) $(BUILD_DIR)/sddf_network_sharedringbuffer.o $(BUILD_DIR)/mux_tx.o $(NETWORK_COMPONENTS_LIBS) -o $(BUILD_DIR)/mux_tx.elf

$(BUILD_DIR)/arp.elf: $(BUILD_DIR)/arp.o $(BUILD_DIR)/sddf_network_sharedringbuffer.o $(BUILD_DIR)/nfs/nfs.a
$(LD) $(NETWORK_COMPONENTS_LDFLAGS) build/sddf_network_sharedringbuffer.o build/arp.o $(BUILD_DIR)/nfs/nfs.a $(NETWORK_COMPONENTS_LIBS) -o build/arp.elf
$(BUILD_DIR)/arp.elf: $(BUILD_DIR)/arp.o $(BUILD_DIR)/sddf_network_sharedringbuffer.o $(BUILD_DIR)/cache.o $(BUILD_DIR)/nfs/nfs.a
aarch64-none-elf-ld $(NETWORK_COMPONENTS_LDFLAGS) $(BUILD_DIR)/sddf_network_sharedringbuffer.o $(BUILD_DIR)/arp.o $(BUILD_DIR)/cache.o $(BUILD_DIR)/nfs/lwip/core/inet_chksum.o $(BUILD_DIR)/nfs/lwip/core/def.o $(NETWORK_COMPONENTS_LIBS) -o $(BUILD_DIR)/arp.elf

directories:
$(info $(shell mkdir -p $(BUILD_DIR)/lwip/src)) \
Expand Down
2 changes: 1 addition & 1 deletion sddf
Submodule sddf updated 46 files
+52 −0 .github/workflows/ci.yaml
+1 −1 .gitignore
+73 −0 ci/examples.sh
+233 −0 drivers/i2c/meson/README.md
+53 −0 drivers/i2c/meson/i2c-sel4cp.h
+178 −0 drivers/i2c/meson/i2c-transport.c
+158 −0 drivers/i2c/meson/i2c.c
+718 −0 drivers/i2c/meson/i2c_driver.c
+12 −0 drivers/i2c/meson/include/clk.h
+52 −0 drivers/i2c/meson/include/gpio.h
+51 −0 drivers/i2c/meson/include/i2c-driver.h
+40 −0 drivers/i2c/meson/include/i2c-token.h
+140 −0 drivers/i2c/meson/include/i2c-transport.h
+55 −0 drivers/i2c/meson/include/i2c.h
+64 −0 drivers/i2c/meson/include/odroidc4-i2c-mem.h
+117 −0 drivers/i2c/meson/include/printf.h
+212 −0 drivers/i2c/meson/include/sw_shared_ringbuffer.h
+914 −0 drivers/i2c/meson/printf.c
+19 −0 drivers/i2c/meson/sw_shared_ringbuffer.c
+2 −2 drivers/network/imx/ethernet.c
+4 −11 examples/echo_server/Makefile
+5 −4 examples/echo_server/echo_server.system
+8 −0 examples/i2c/.gitignore
+100 −0 examples/i2c/Makefile
+17 −0 examples/i2c/README.md
+195 −0 examples/i2c/client.c
+1 −0 examples/i2c/client.h
+120 −0 examples/i2c/i2c.system
+438 −0 examples/i2c/pn532.c
+23 −0 examples/i2c/pn532.h
+1 −1 examples/timer/Makefile
+1 −1 include/sddf/network/shared_ringbuffer.h
+9 −0 libco/LICENSE.txt
+82 −0 libco/aarch64.c
+74 −0 libco/amd64.c
+49 −0 libco/arm.c
+21 −0 libco/libco.c
+19 −0 libco/libco.h
+21 −0 libco/settings.h
+0 −55 network/components/arp.c
+44 −15 network/components/lwip.c
+14 −1 network/components/udp_echo_socket.c
+2 −4 network/components/utilization_socket.c
+1 −1 network/libethsharedringbuffer/shared_ringbuffer.c
+162 −20 serial/config.json
+1 −1 serial/libserialsharedringbuffer/include/shared_ringbuffer.h

0 comments on commit 70d42c3

Please sign in to comment.