Cleanup of module building.

src/modules/systemlib/mcu_version.c

@@ -62,7 +62,7 @@
 /** Copy the 96bit MCU Unique ID into the provided pointer */
 void mcu_unique_id(uint32_t *uid_96_bit)
 {
-#ifdef __PX4_NUTTX
+#ifdef CONFIG_ARCH_CHIP_STM32
 	uid_96_bit[0] = getreg32(UNIQUE_ID);
 	uid_96_bit[1] = getreg32(UNIQUE_ID + 4);
 	uid_96_bit[2] = getreg32(UNIQUE_ID + 8);

src/modules/systemlib/printload.c

@@ -261,7 +261,11 @@ void print_load(uint64_t t, int fd, struct print_load_s *print_state)
 				stack_size - stack_free,
 				stack_size,
 				system_load.tasks[i].tcb->sched_priority,
+#if CONFIG_ARCH_BOARD_SIM
+				0);
+#else
 				system_load.tasks[i].tcb->base_priority);
+#endif
 
 #if CONFIG_RR_INTERVAL > 0
 			/* print scheduling info with RR time slice */