HelenOSHelenOS-docHelenOS-historic

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk/boot @ 4674

  → /trunk/boot/ @ 4675

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 4674 → Rev 4675

/trunk/boot/arch/arm32/loader/print/print.c
40,11 → 40,12
/** Address where characters to be printed are expected. */
#ifdef MACHINE_GXEMUL_TESTARM
#define PUTC_ADDRESS 0x10000000
#ifdef MACHINE_testarm
#define PUTC_ADDRESS 0x10000000
#endif
#ifdef MACHINE_ICP
#define PUTC_ADDRESS 0x16000000
#ifdef MACHINE_integratorcp
#define PUTC_ADDRESS 0x16000000
#endif

/trunk/boot/arch/arm32/loader/Makefile
41,15 → 41,6
TARGET = arm-linux-gnu
TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
ifeq ($(MACHINE), testarm)
DMACHINE = MACHINE_GXEMUL_TESTARM
endif
ifeq ($(MACHINE), integratorcp)
DMACHINE = MACHINE_ICP
endif
ifeq ($(COMPILER),gcc_native)
CC = gcc
AS = as
102,7 → 93,7
$(USPACEDIR)/srv/fs/tmpfs/tmpfs \
$(USPACEDIR)/srv/fs/fat/fat \
$(USPACEDIR)/srv/bd/file_bd/file_bd
ifeq ($(MACHINE), testarm)
ifeq ($(MACHINE),testarm)
RD_SRVS += \
$(USPACEDIR)/srv/bd/gxe_bd/gxe_bd
endif
160,4 → 151,4
$(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
%.o: %.c
$(CC) -D$(DMACHINE) $(DEFS) $(CFLAGS) -c $< -o $@
$(CC) $(DEFS) $(CFLAGS) -c $< -o $@