Changeset 97c7682 in mainline for boot/arch/arm32/Makefile.inc

Timestamp:

2012-07-14T11:18:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• boot/arch/arm32/Makefile.inc (modified) (1 diff)

boot/arch/arm32/Makefile.inc

@@ -53 +53 @@
 ifeq ($(MACHINE), gta02)
 RD_SRVS_ESSENTIAL += \
-        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24ts \
-        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
+        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
+        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24xx_uart
 endif