From 4efaedd33a2f144a2e33499056094e770517942b Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Thu, 24 Mar 2011 05:24:40 -0700 Subject: [PATCH] fix typo in Makefile --- include/metalsvm/config.h | 80 --------------------------------------- tools/Makefile | 2 +- 2 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 include/metalsvm/config.h diff --git a/include/metalsvm/config.h b/include/metalsvm/config.h deleted file mode 100644 index d023db96..00000000 --- a/include/metalsvm/config.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 2010 Stefan Lankes, Chair for Operating Systems, - * RWTH Aachen University - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * This file is part of MetalSVM. - */ - -#ifndef __CONFIG_H__ -#define __CONFIG_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#define METALSVM_VERSION "0.1" -#define MAX_TASKS 16 -#define MAX_CORES 4 -#define MAX_FNAME 128 -#define DEFAULT_STACK_SIZE (32*1024) -#define KERNEL_STACK_SIZE 8192 -#define KMSG_SIZE (128*1024) -#define PAGE_SIZE 4096 -#define CACHE_LINE 64 -#define MAILBOX_SIZE 8 -#define TIMER_FREQ 100 /* in HZ */ -#define CLOCK_TICK_RATE 1193182 /* 8254 chip's internal oscillator frequency */ -#define INT_SYSCALL 0x80 -#define KERNEL_SPACE (1*1024*1024*1024) -#define VIDEO_MEM_ADDR 0xB8000 // the video memora address - -#define BYTE_ORDER LITTLE_ENDIAN - -/* - * address space / (page_size * sizeof(uint8_t)) - * x86_32 => 4 GB / (4096 * 8) - */ -#define BITMAP_SIZE 1048576 - -#define CONFIG_PCI -#define CONFIG_LWIP -#define CONFIG_VGA -#define CONFIG_KEYBOARD -#define CONFIG_MULTIBOOT -#define CONFIG_ROCKCREEK - -// RCCE specific flags -#define SCC -#define MS_BAREMETAL -#define GORY -//#define SHMADD -//#define SHMADD_CACHEABLE - -#define BUILTIN_EXPECT(exp, b) __builtin_expect((exp), (b)) -//#define BUILTIN_EXPECT(exp, b) (exp) -#define NORETURN __attribute__((noreturn)) -#define STDCALL __attribute__((stdcall)) - -#define HAVE_ARCH_MEMSET -#define HAVE_ARCH_MEMCPY -#define HAVE_ARCH_STRLEN -#define HAVE_ARCH_STRCPY -#define HAVE_ARCH_STRNCPY - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/tools/Makefile b/tools/Makefile index b01caba6..a0214641 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -6,7 +6,7 @@ LDFLGAS = DEFINES= NASM = nasm NASMFLAGS = -fbin -EXECFILES = $(shell find ../newlib/examples -perm -o+r+x -type f) +EXECFILES = $(shell find ../newlib/examples -perm -u+r+x -type f) # other implicit rules %.o : %.c