Commit 850b15b4 authored by Tristan Gingold's avatar Tristan Gingold

Include ppsi.mk in Makefile

so that ppsi is built directly by the wrc Makefile
(and not using a recursive make)

Fixes some format warning
(stdint.h now comes from include/std)
parent e3208b0e
Pipeline #4513 passed with stage
in 3 minutes and 46 seconds
......@@ -74,11 +74,12 @@ dump-info.o: CFLAGS+=-Ippsi/tools -fno-lto
cflags-y = -ffreestanding -include $(AUTOCONF) -Iinclude \
-I. -Isoftpll -Iipc
cflags-y += -I$(CURDIR)/pp_printf
cflags-y += -Ipp_printf
cflags-$(CONFIG_LTO) += -flto
# Only for lm32
cflags-$(CONFIG_ARCH_LM32) += -Iinclude/std
cflags-$(CONFIG_ARCH_RISCV) += -Iinclude/std
cflags-$(CONFIG_WRPC_PPSI) += \
-I$(PPSI)/arch-wrpc \
......@@ -90,8 +91,17 @@ cflags-y += \
-I$(PPSI)/arch-wrpc/include \
-I$(PPSI)/include
obj-ppsi = $(PPSI)/ppsi.a
obj-$(CONFIG_WRPC_PPSI) += $(obj-ppsi)
ifdef CONFIG_WRPC_PPSI
# we should use linux/scripts/setlocalversion instead...
PPSI_VERSION := $(shell cd ppsi; git describe --always --dirty)
cflags-y += -DPPSI_VERSION=\"$(PPSI_VERSION)\"
OBJ-y :=
ARCH=wrpc
include $(PPSI)/ppsi.mk
obj-y += $(OBJ-y)
endif
# Below, CONFIG_PPSI is wrong, as we can't build these for the host
obj-$(CONFIG_EMBEDDED_NODE) += \
......
......@@ -2525,7 +2525,8 @@ static void mmc_show_version_info( const char *brdname, struct ertm14_mmc_state
pp_printf("MMC Build Info for %s:\n", brdname );
pp_printf(" - Git build commit : %32s\n", st->info.git_sha );
pp_printf(" - Git build tag : %32s\n", st->info.git_tag );
pp_printf(" - Build date : %lu (Unix)\n", le32_to_host( st->info.build_date ) );
pp_printf(" - Build date : %u (Unix)\n",
(unsigned)le32_to_host( st->info.build_date ) );
pp_printf(" - Serial Number : %32s\n", st->info.board_serial_number );
}
......
Subproject commit 363636f371b661a6812ebf4dee206729760e8796
Subproject commit 60f708fd14be157e9c0dc1b7f5630380b0a47efc
......@@ -189,7 +189,8 @@ static int measure_vcxo_freq(int cm_channel, int n_steps, uint32_t expected_freq
if (tune == tune_max)
break;
pp_printf(" - DAC value=%d, f=%d Hz, delta_f=%ld Hz\n", tune, f, f - expected_freq);
pp_printf(" - DAC value=%d, f=%d Hz, delta_f=%d Hz\n",
tune, f, (int)(f - expected_freq));
tune += tune_step;
if (tune > tune_max)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment