Changeset 445 for trunk/params-soft.mk

Timestamp:

May 29, 2018, 9:27:23 AM (6 years ago)

Author:

alain

Message:

Restructure the mini_libc.

File:

• trunk/params-soft.mk (modified) (3 diffs)

trunk/params-soft.mk

@@ -1 +1 @@
 
-#put your absolute path to almos-mkh dir here
+# define absolute path to almos-mkh directory
 ALMOSMKH_DIR = /Users/alain/soc/almos-mkh
 
+# Select the libc
 LIBC_NAME = mini-libc
 #LIBC_NAME = newlib
 
+# Select the target architecture
 ARCH_NAME = tsar_mips32
 #ARCH_NAME = x86_64
 
-LIBPTHREAD_NAME = mini-libpthread
-
+# check
 ifeq ($(ALMOSMKH_DIR),)
 $(error Please define ALMOSMKH_DIR parameter in params-soft.mk!)
 endif
 
+ifeq ($(ARCH_NAME),)
+$(error Please define ARCH_NAME parameter in params-soft.mk!)
+endif
 
+# define path for LIBC
 ifeq ($(LIBC_NAME), mini-libc)
-  LIBC_PATH = $(ALMOSMKH_DIR)/libs/mini-libc/
-  LIBC = $(LIBC_PATH)/build/lib/
+  LIBC_PATH    = $(ALMOSMKH_DIR)/libs/mini-libc/
+  LIBC         = $(LIBC_PATH)/build/lib/
   LIBC_INCLUDE = $(LIBC_PATH)/build/include/
 endif
@@ -26 +31 @@
   endif
   #TODO for x86
-  LIBC_PATH = $(ALMOSMKH_DIR)/libs/newlib/
-  LIBC = $(LIBC_PATH)/build/$(ARCH_NEWLIB)-almosmkh/lib/
+  LIBC_PATH    = $(ALMOSMKH_DIR)/libs/newlib/
+  LIBC         = $(LIBC_PATH)/build/$(ARCH_NEWLIB)-almosmkh/lib/
   LIBC_INCLUDE = $(LIBC_PATH)/build/$(ARCH_NEWLIB)-almosmkh/include/
 endif
 
-ifeq ($(LIBPTHREAD_NAME), mini-libpthread)
-  LIBPTHREAD_PATH = $(ALMOSMKH_DIR)/libs/mini-libpthread/
-endif
+# define paths for LIBPTHREAD
+LIBPTHREAD_PATH    = $(ALMOSMKH_DIR)/libs/libpthread/
+LIBPTHREAD         = $(LIBPTHREAD_PATH)/build/lib/
+LIBPTHREAD_INCLUDE = $(LIBPTHREAD_PATH)/build/include/
 
-LIBALMOSMKH_PATH = $(ALMOSMKH_DIR)/libs/libalmos-mkh
-#Define path to .a and headers files for libc and libpthread
-LIBPTHREAD = $(LIBPTHREAD_PATH)/build/lib/
-LIBPTHREAD_INCLUDE = $(LIBPTHREAD_PATH)/build/include/
-LIBALMOSMKH = $(LIBALMOSMKH_PATH)/build/lib/
+# define paths for LIBALMOSMKH
+LIBALMOSMKH_PATH    = $(ALMOSMKH_DIR)/libs/libalmosmkh
+LIBALMOSMKH         = $(LIBALMOSMKH_PATH)/build/lib/
 LIBALMOSMKH_INCLUDE = $(LIBALMOSMKH_PATH)/build/include/
 
+# define paths for HAL
+HAL      = $(ALMOSMKH_DIR)/hal
+HAL_ARCH = $(HAL)/$(ARCH_NAME)
 
-HAL  = $(ALMOSMKH_DIR)/hal
-KERNEL = $(ALMOSMKH_DIR)/kernel
+KERNEL   = $(ALMOSMKH_DIR)/kernel
+
 SHARED_INCLUDE = $(KERNEL)/syscalls/shared_include/
 
@@ -72 +79 @@
 endif
 
-ifeq ($(ARCH_NAME),)
-$(error Your ARCH_NAME is not support, check params-soft.mk!)
-endif
-
 BOOTLOADER_PATH = boot/$(ARCH_NAME)
-HAL_ARCH = $(HAL)/$(ARCH_NAME)